Ryan Huffman e6d9a1b251 Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale ... Conflicts: interface/src/ui/LoginDialog.cpp		2015-02-20 18:09:55 -08:00
..
external	Update Faceshift readme.txt with Windows instructions	2015-02-20 11:29:51 -08:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
src	Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale	2015-02-20 18:09:55 -08:00
ui	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
CMakeLists.txt	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in