Sam Gondelman 15cdfef16a Merge branch 'master' into decals		2018-02-14 17:33:01 -08:00
..
avatar
config
controllers	added control button for controller API	2018-02-13 09:41:00 -08:00
fonts	added image icon	2018-02-02 10:27:44 -08:00
html
icons	merge from master	2018-02-13 13:58:39 -08:00
images	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
mention-sounds
meshes	new local reference to image model	2018-02-02 10:27:44 -08:00
qml	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
QtWebEngine/UIDelegates
shaders
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage