Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-15 06:52:34 +02:00
Code Issues Projects Releases Activity
852 Commits 19 Branches 35 Tags 192 MiB
0a27b61885
Commit Graph

9 Commits

Author SHA1 Message Date
Elias
fe660f6a0a Add vcpkg 2019-04-27 15:35:19 +02:00
Elias
e03cfd5b3c Add dep install script for windows 2019-04-27 11:46:37 +02:00
Elias
24160f1e28 Remove common folder <.< 2018-12-04 19:23:03 +01:00
kelteseth
55a11b471a Merge remote-tracking branch 'origin/es/feature/convertVideo' into dev 
# Conflicts:
#	ScreenPlay/Resources.qrc
#	ScreenPlay/main.cpp
#	ScreenPlay/qml/Create/CreateWallpaper.qml
#	ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
#	ScreenPlay/qml/Navigation.qml
#	ScreenPlay/src/create.cpp
#	ScreenPlayWidget/ScreenPlayWidget.pro
#	ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro
 2018-12-04 13:25:03 +01:00
kelteseth
964b63f604 Remove workshop, server and common 2018-11-21 23:13:23 +01:00
Daniel Schukies
4aa03a1d76 Add proto stuff, needs fix 2018-11-21 21:07:04 +01:00
kelteseth
2c059d2efc Fix compiling 2018-11-17 18:38:02 +01:00
kelteseth
6203a2e8c0 Fix 2018-11-17 18:35:09 +01:00
Daniel Schukies
8e10948094 Add protocolbuffer lib 2018-11-17 11:31:38 +01:00