1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2025-01-31 20:41:43 +01:00
Elias Steurer 0f5b310f68 Merge branch 'master' into qt6-kde
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/src/screenplaymanager.cpp
#	Tools/build.py
2021-12-31 13:32:37 +01:00
..