Merge branch 'master' into mac

# Conflicts:
#	GpApp/Main.cpp
This commit is contained in:
Madthijs
2021-05-11 14:28:46 +02:00
76 changed files with 3895 additions and 1365 deletions

View File

@@ -585,7 +585,7 @@ int AppStartup()
FlushResolutionChange();
}
ShowInitialLaunchDisclaimer();
ShowInitialLaunchDisclaimer();
}
if (thisMac.isResolutionDirty)