Andrew Meadows 47e340dafe Merge upstream/master ... Conflicts: interface/src/avatar/MyAvatar.cpp		2014-03-07 09:16:33 -08:00
..
external	tweak the oculus find module to take copied-in folders	2014-03-06 14:16:38 -08:00
resources	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
src	Merge upstream/master	2014-03-07 09:16:33 -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 pull request #2229 from birarda/master	2014-03-06 22:43:32 -08:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
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