vladest e8959b4cc0 Merge branch 'master' into move_to_qqc2		2018-02-13 22:01:16 +01:00
..
avatar
config
controllers	Added exponential smoothing filter	2017-12-08 09:29:54 -08:00
fonts	added image icon	2018-02-02 10:27:44 -08:00
html	Fix web entities accessing the webcam	2017-12-12 16:00:17 -07:00
icons	Merge pull request #12272 from elisa-lj11/2d-images	2018-02-13 11:44:02 -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 move_to_qqc2	2018-02-13 22:01:16 +01:00
QtWebEngine/UIDelegates	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
shaders
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage