stojce 3339b92a49 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964		2014-09-05 07:45:55 +02:00
..
config
html	Update welcome screen	2014-05-06 16:17:40 -07:00
icons	- few Adjustments in Application class for Script editor	2014-04-21 05:25:28 +02:00
images	New reticle for sixense and oculus mouse movement	2014-06-13 15:03:09 -07:00
info
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes
shaders	Switch to deferred lighting for metavoxels.	2014-09-04 17:17:44 -07:00
sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
styles	Remove custom styling	2014-08-23 00:16:25 +02:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00