NeetBhagat ead0d42cf3 Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h		2017-06-07 15:47:19 +05:30
..
avatar	got the shoulders working	2017-05-24 19:31:48 +01:00
config
controllers	making some final changes	2017-05-30 23:55:45 +01:00
fonts	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12: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 branch 'master' into 21369	2017-06-07 15:47:19 +05:30
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
snapshot/img	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -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