Merge branch 'develop' into Bumber64-patch-2

develop
Ryan Williams 2022-05-05 22:58:23 -07:00 committed by GitHub
commit 14afcc2b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

@ -192,7 +192,7 @@ endif()
# set up versioning. # set up versioning.
set(DF_VERSION "0.47.05") set(DF_VERSION "0.47.05")
set(DFHACK_RELEASE "r4") set(DFHACK_RELEASE "r5")
set(DFHACK_PRERELEASE FALSE) set(DFHACK_PRERELEASE FALSE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

@ -1 +1 @@
Subproject commit 5fe90d06ebad4f9686545b7c961c2c07b8bcb799 Subproject commit 7ec5d86996269df5e01d64ea5bae67d0c29afd77

@ -1 +1 @@
Subproject commit 714ef87aef713af94874c6441e7810b9cf9ef312 Subproject commit b808050d4a3885aa0e250e726708b2b28fe28260