1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
ScreenPlay/ScreenPlayWorkshop
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
..
src Add explicit property for steam 2021-09-04 12:13:00 +02:00
SteamSDK Merge branch 'master' into qt6-support 2021-09-10 11:09:38 +02:00
CMakeLists.txt Merge branch 'master' into qt6-support 2021-09-10 11:09:38 +02:00
qmldir Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00
steam_appid.txt Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00