Stephen Birarda d51deca0fe Merge branch 'master' of https://github.com/highfidelity/hifi		2014-03-06 16:45:41 -08:00
..
external	tweak the oculus find module to take copied-in folders	2014-03-06 14:16:38 -08:00
resources	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
src	Merge pull request #2194 from AndrewMeadows/cleanup	2014-03-06 15:49:22 -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	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-06 14:45:02 -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