Elias Steurer 4504f06eb1 Merge branch 'master' into qt6-support ... # Conflicts: # CMakeLists.txt # ScreenPlay/app.h # ScreenPlay/main.cpp # ScreenPlay/main.qml # ScreenPlay/qml/Navigation/Navigation.qml # ScreenPlay/src/settings.h # ScreenPlay/translations/ScreenPlay_zh_cn.qm # ScreenPlayWallpaper/CMakeLists.txt # ScreenPlayWallpaper/SPWResources.qrc # ScreenPlayWallpaper/qml/Wallpaper.qml		2021-09-10 11:09:38 +02:00
..
inc	Refactor widget removal/restore	2021-05-16 11:57:50 +02:00
src	Merge master	2021-05-18 17:26:02 +02:00
CMakeLists.txt	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
qmldir	Cleanup	2019-06-10 16:27:17 +02:00