kelteseth e5302d6d00 Merge remote-tracking branch 'origin/feature/macos' into dev ... # Conflicts: # ScreenPlay.pro		2018-12-01 18:06:32 +01:00
..
assets	Merge remote-tracking branch 'origin/feature/macos' into dev	2018-12-01 18:06:32 +01:00
examples@66091ad14d	Add create of empty widgets	2018-03-20 14:42:22 +01:00
legal	Add DataProtection and make SettingsExpander generic	2018-09-14 18:30:57 +02:00
qml	Merge remote-tracking branch 'origin/feature/macos' into dev	2018-12-01 18:06:32 +01:00
src	Merge remote-tracking branch 'origin/feature/macos' into dev	2018-12-01 18:06:32 +01:00
ThirdParty	Add macosx ffmpeg libs	2018-12-01 18:00:49 +01:00
translations	Add translations	2018-09-13 20:22:58 +02:00
DefaultProfilePackage.json	Moving the project into a subdir project	2018-01-31 21:54:25 +01:00
favicon.ico	More cleanup to better use debug/release builds	2018-08-25 00:48:59 +02:00
main.cpp	Fix bin paths for Widget and Window binary	2018-11-26 22:28:35 +01:00
main.qml	Removed Google Tracker for MacOS	2018-11-26 20:37:18 +01:00
qtquickcontrols2.conf	Moving the project into a subdir project	2018-01-31 21:54:25 +01:00
Resources.qrc	Add empty screen nav element	2018-11-24 16:51:30 +01:00
ScreenPlay.pro	Fix broken dependency	2018-11-27 20:14:46 +01:00
settings.json	Change send statistics to false because of new EU laws :)	2018-03-08 22:03:43 +01:00
steam_appid.txt	Moving the project into a subdir project	2018-01-31 21:54:25 +01:00