Ryan Huffman 4115e0fab2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 ... Conflicts: interface/src/Application.cpp interface/ui/preferencesDialog.ui		2014-05-21 13:42:37 -07:00
..
config
html	Update welcome screen	2014-05-06 16:17:40 -07:00
icons
images	Merge remote-tracking branch 'upstream/master' into RunningScripts	2014-04-29 16:28:36 -07:00
info
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes
shaders	Restore specular lighting--but, per the OpenGL spec, shut off specular	2014-05-19 12:29:49 -07:00
sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
styles	Add ScriptsLocation settings value	2014-05-14 00:28:11 -07:00
visage