Elias Steurer ea050e439a Merge branch 'dev' into feature/basic-project-creator ... # Conflicts: # ScreenPlay/Resources.qrc # ScreenPlay/src/createimportvideo.cpp # ScreenPlay/src/installedlistmodel.h # ScreenPlay/src/screenplaymanager.cpp # ScreenPlay/src/settings.cpp # ScreenPlay/src/settings.h # ScreenPlay/src/util.cpp		2020-01-06 15:27:29 +01:00
..
css	Add qdocs	2019-12-05 15:24:12 +01:00
html	Add documentation for all classes and methods	2019-12-08 11:38:48 +01:00
js	Add documentation for all classes and methods	2019-12-08 11:38:48 +01:00
config.qdocconf	Update Docs/config.qdocconf	2019-12-29 14:40:37 +00:00
index.html	Fix ScreenPlay Dev Docs title	2019-12-13 13:17:43 +01:00