diff --git a/changelog.md b/changelog.md index 3ebe5084773..7f2759bd1b9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,4 @@ -## Version 1.17.25+dev - ### Add-ons client - ### Add-ons server +## Version 1.17.26 ### Campaigns * Eastern Invasion * Many minor bugfixes @@ -14,7 +12,6 @@ * Adjust Fighter unit line for easier early leveling and more late game staying power. * World Conquest * Fix the Bezoar artifact (issue #6513) - ### Editor ### Multiplayer * Assume that all players need a copy of an add-on, by defaulting `require_modification`/`require_campaign` to `yes` (PR #8135) ### Lua API @@ -23,7 +20,6 @@ * Add CMake and SCons options to use an already installed copy of Lua 5.4 (PR #8234) * The system copy of Lua must be compiled as C++ rather than C, as Wesnoth uses C++ exceptions. * Windows requires a compile-time change to Lua, so must use the in-tree Lua submodule. - ### Terrain ### Translations * New translation: Bengali * Updated translations: Arabic, British English, Czech, Finnish, French diff --git a/data/tools/wesnoth/version.py b/data/tools/wesnoth/version.py index f58c83e71ae..fb293a8a838 100755 --- a/data/tools/wesnoth/version.py +++ b/data/tools/wesnoth/version.py @@ -2,8 +2,8 @@ major = 1 minor = 17 -release = 25 -dev_suffix = "+dev" # either use "+dev", "-dev", "" (empty string) or None +release = 26 +dev_suffix = "" # either use "+dev", "-dev", "" (empty string) or None as_string = "{}.{}.{}{}".format(major, minor, diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 7ade66e040b..7fabaafa122 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "The Battle for Wesnoth" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.17.25+dev +PROJECT_NUMBER = 1.17.26 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/projectfiles/Xcode/Info.plist b/projectfiles/Xcode/Info.plist index 719602057c2..ba4c1616139 100644 --- a/projectfiles/Xcode/Info.plist +++ b/projectfiles/Xcode/Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.17.25 + 1.17.26 CFBundleSignature ???? CFBundleVersion - 1.17.25 + 1.17.26 LSApplicationCategoryType public.app-category.strategy-games NSHighResolutionCapable diff --git a/src/wesconfig.h b/src/wesconfig.h index 8fbc167df83..1c3b0059b99 100644 --- a/src/wesconfig.h +++ b/src/wesconfig.h @@ -40,7 +40,7 @@ #undef VERSION #endif -#define VERSION "1.17.25+dev" +#define VERSION "1.17.26" // Used for the Windows executables' version info resource. #define RC_VERSION_MAJOR 1