Andrew Meadows 82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions ... Conflicts: interface/src/Application.cpp		2014-01-29 13:20:42 -08:00
..
external	fixing bad merge	2014-01-17 20:01:49 +01:00
resources	Don't add the specular alpha in the model fragment shaders.	2014-01-27 17:44:13 -08:00
src	Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions	2014-01-29 13:20:42 -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	remove QUiTools include, not needed	2014-01-22 14:20: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