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
controllers	Swap start/back xbox controller mapping to conform to Oculus standard	2016-12-09 16:41:42 -08:00
fonts
html	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
icons
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
shaders	hacking	2016-10-18 21:33:37 -07:00
sounds
styles
visage