Dante Ruiz 8cb9bfcc81 fixed merge conflict		2017-05-24 19:35:41 +01:00
..
avatar	got the shoulders working	2017-05-24 19:31:48 +01:00
config
controllers	fixed merge conflict	2017-05-24 19:35:41 +01:00
fonts	add new glyphs with check, reference in entityList	2017-04-20 14:21:13 -07:00
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	Change default avatar to ball and stick avatar	2017-04-04 09:39:06 -07:00
qml	Merge pull request #10529 from samcake/ambient	2017-05-24 10:48:21 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders	hacking	2016-10-18 21:33:37 -07:00
sounds	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage