Stephen Birarda 6e0f484bdc Merge branch 'master' of https://github.com/highfidelity/hifi into authentication		2014-02-04 15:54:15 -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 https://github.com/highfidelity/hifi into authentication	2014-02-04 15:54:15 -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
InterfaceConfig.h.in
InterfaceVersion.h.in