Andrew Meadows c24cbdadc1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup ... Conflicts: interface/src/avatar/MyAvatar.cpp		2014-02-19 10:00:51 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop	2014-02-16 18:14:24 -08:00
src	Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup	2014-02-19 10:00:51 -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	Use the ABI-compatible library (hopefully).	2014-02-18 15:37:40 -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