1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
ScreenPlay/ScreenPlayWorkshop/SteamSDK
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
..
public/steam Apply clang format 2021-07-25 15:30:37 +02:00
redistributable_bin Remove git-lfs that breaks gitlab-ci 2021-07-30 10:51:08 +02:00
CMakeLists.txt Merge branch 'master' into qt6-support 2021-09-10 11:09:38 +02:00
generate_qt_enums.py Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00
SteamSDK.md Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00