overte-HifiExperiments/interface/resources
Ryan Huffman 7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
2014-06-17 20:27:16 -07:00
..
config
html
icons
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 Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
sounds fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
styles Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-11 13:30:47 -07:00
visage