David Rowe 1f3045ad30 Merge branch 'master' into 21089 ... Conflicts: interface/src/Application.cpp		2016-12-13 14:05:24 +13:00
..
avatar	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"	2016-12-05 15:18:03 -08:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Swap start/back xbox controller mapping to conform to Oculus standard	2016-12-09 16:41:42 -08:00
fonts	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
html	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
icons	New art.	2016-07-01 10:34:13 -07:00
images	styling changes	2016-11-16 15:54:11 -08:00
info
mention-sounds
meshes	Update being of light model	2016-10-28 14:56:36 -07:00
qml	Merge branch 'master' into 21089	2016-12-13 14:05:24 +13:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	hacking	2016-10-18 21:33:37 -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