Brad Hefta-Gaub 0c891ddfa8 Merge branch 'master' of https://github.com/ZappoMan/hifi		2014-01-24 09:55:52 -08:00
..
external	Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build	2014-01-16 14:33:44 -08:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-22 15:59:02 -08:00
src	Merge branch 'master' of https://github.com/ZappoMan/hifi	2014-01-24 09:55:52 -08:00
ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00
CMakeLists.txt	remove QUiTools include, not needed	2014-01-22 14:20:40 -08:00
interface.icns
InterfaceConfig.h.in	Adding build sequence to Interface build	2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in	Checkpoint	2014-01-13 07:37:47 -06:00