Andrzej Kapolka f5eaa330d8 Merge branch 'master' of https://github.com/highfidelity/hifi		2014-03-03 15:48:38 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-03 15:48:38 -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
InterfaceConfig.h.in
InterfaceVersion.h.in	Checkpoint	2014-01-13 07:37:47 -06:00