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
..
qml	Add ScreenPlayWindow deploy	2018-11-11 17:56:35 +01:00
src	Implement basic invoke of native Mac bridge wrapper for screenplay window	2018-11-27 11:34:09 +01:00
index.html	Fix video rendering for macOS	2018-11-27 18:53:30 +01:00
ScreenPlayWindow.pro	Fix video rendering for macOS	2018-11-27 18:53:30 +01:00
SPWmain.cpp	Merge remote-tracking branch 'origin/es/feature/convertVideo' into dev	2018-12-04 13:25:03 +01:00
SPWResources.qrc	Add ScreenPlayWindow deploy	2018-11-11 17:56:35 +01:00