Merge remote-tracking branch 'lethosor/0.40.24-dev' into develop

develop
expwnent 2015-01-23 21:49:20 -05:00
commit 6f9fd325b9
2 changed files with 3 additions and 3 deletions

@ -58,8 +58,8 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif()
# set up versioning.
set(DF_VERSION "0.40.23")
SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.")
set(DF_VERSION "0.40.24")
SET(DFHACK_RELEASE "r0" CACHE STRING "Current release revision.")
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
add_definitions(-DDFHACK_VERSION="${DFHACK_VERSION}")

@ -1 +1 @@
Subproject commit 20014d2f501b76b697e594d56e594ea8f143ea24
Subproject commit da293270f3eb7f0519b1622ae967ab63fd7f5850