Dante Ruiz 9e4b5693c7 fixed merge conflicts		2017-07-06 18:49:46 +01:00
..
avatar
config
controllers	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
fonts	added new glyph	2017-07-06 00:45:59 +01:00
html
icons
images	added new glyph	2017-07-06 00:45:59 +01:00
mention-sounds
meshes
qml	fixed merge conflicts	2017-07-06 18:49:46 +01:00
QtWebEngine/UIDelegates
shaders
snapshot/img
sounds
styles
visage