Howard Stearns eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates		2015-09-08 16:54:14 -07:00
..
config
fonts	updated FontAwesome to v4.4	2015-08-25 01:55:52 +02:00
html
icons
images	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
info
mention-sounds
meshes	Avatar animations on by default. (Using the now old animation machinery.)	2015-09-04 14:24:37 -07:00
qml	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
shaders
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles
visage