David Rowe a767a27e7e Merge branch 'master' into 21070 ... Conflicts: interface/resources/qml/AddressBarDialog.qml		2016-10-16 14:09:53 +13:00
..
avatar	Updated default idle and turn animations.	2016-05-09 18:43:30 -07:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes	2016-10-13 10:57:27 -07:00
fonts	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
html	Fix keyboard state in browser when switching focus to/from dialog frame	2016-10-14 12:14:23 +13:00
icons	New art.	2016-07-01 10:34:13 -07:00
images	remove obsolete file	2016-09-22 16:49:38 -07:00
info
mention-sounds
meshes	replace the default avatar with the being of light	2016-04-22 13:48:30 -07:00
qml	Merge branch 'master' into 21070	2016-10-16 14:09:53 +13:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	Remove oglplus usage from OpenVR	2016-10-02 11:44:33 -07:00
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles
visage	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00