Andrzej Kapolka 8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-02-23 20:13:23 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	Changed Import button size	2014-02-20 10:37:31 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-23 20:13:23 -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 remote-tracking branch 'upstream/master'	2014-02-20 23:32:06 -05: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