Brad Hefta-Gaub 78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck ... Conflicts: libraries/networking/src/udt/PacketHeaders.cpp		2016-05-25 17:18:27 -07:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Make file browser dialog movable	2016-05-25 13:49:01 +12:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck	2016-05-25 17:18:27 -07:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00