Merge branch 'master' into mac

# Conflicts:
#	GpApp/House.cpp
This commit is contained in:
Madthijs
2021-05-14 21:44:39 +02:00
35 changed files with 541 additions and 531 deletions

View File

@@ -4,6 +4,6 @@
#define GP_BUILD_VERSION_MINOR 1
#define GP_BUILD_VERSION_UPDATE 0
#define GP_APPLICATION_VERSION_STRING "1.1.0 rc1"
#define GP_APPLICATION_VERSION_STRING "1.1.0 Release Candidate 2"
#define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Gale Force Games LLC"
#define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"