Seth Alves 10ddbecdb9 Merge branch 'master' of github.com:highfidelity/hifi into head-controller		2017-06-01 13:37:22 -07:00
..
avatar	got the shoulders working	2017-05-24 19:31:48 +01:00
config
controllers	oops missed a comma	2017-05-31 10:21:10 -07:00
fonts
html	Fix keyboard not raising for Facebook username field	2017-04-30 11:40:28 +12:00
icons	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
images	Compress Default Skybox with BC7	2017-05-18 13:13:40 -07:00
mention-sounds
meshes
qml	we can sort on ignored	2017-06-01 07:29:31 -07:00
QtWebEngine/UIDelegates
shaders
snapshot/img	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
sounds
styles
visage