stojce 939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/src/Menu.h		2014-03-13 18:41:58 +01:00
..
config
html
icons
images	Changed the chat window to a popup with a custom closing button.	2014-03-13 04:07:33 +02:00
info
meshes
shaders	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
sounds
styles	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-08 13:19:45 +01:00
visage	Applied Ryan's tweaks to Visage mapping and config file.	2014-03-10 15:13:24 -07:00
resources.qrc	Changed the chat window to a popup with a custom closing button.	2014-03-13 04:07:33 +02:00