Seth Alves d812c293e8 Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values		2017-08-10 12:29:23 -07:00
..
avatar	Shoulder puck calibration work in progress	2017-07-24 17:22:48 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
fonts	added new glyph	2017-07-06 00:45:59 +01:00
html	5351: Help Button has Old UI	2017-08-09 20:56:02 +03:00
icons	Merge pull request #10886 from 1P-Cusack/21420	2017-07-14 10:06:45 -07:00
images	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
mention-sounds
meshes	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
qml	Merge pull request #11120 from mukulHF/bug-lock-default-scripts	2017-08-10 12:29:23 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders
snapshot/img	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
sounds	add sample sound	2017-06-19 14:41:01 -07:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage