diff --git a/Doxyfile b/Doxyfile index 11087a1aa094..f0d4710ac543 100644 --- a/Doxyfile +++ b/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "The Battle for Wesnoth" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.12.3+dev +PROJECT_NUMBER = 1.12.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/changelog b/changelog index 75b58dc6ceac..3f7224adf75b 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,7 @@ -Version 1.12.3+dev: +Version 1.12.4: * Security fixes: * Disallowed WML inclusion of .pbl files with a non-lowercase extension too (CVE-2015-5070, bug #23504). - * Language and i18n: - * Updated translations: * Miscellaneous and bug fixes: * Removed broken Python port of wmlxgettext from data/tools/. diff --git a/players_changelog b/players_changelog index 9e16ae3dc11c..ca1497a09b8e 100644 --- a/players_changelog +++ b/players_changelog @@ -2,12 +2,10 @@ This is meant to be a concise list of player-visible changes (very minor changes may be omitted). For a complete list of changes, see the main changelog: https://github.com/wesnoth/wesnoth/blob/1.12/changelog -Version 1.12.3+dev: +Version 1.12.4: * Security fixes: * Disallowed WML inclusion of .pbl files with a non-lowercase extension too (CVE-2015-5070, bug #23504). - * Language and i18n: - * Updated translations: Version 1.12.3: diff --git a/src/wesconfig.h b/src/wesconfig.h index 5afa0ea8f165..d03fd236b97f 100644 --- a/src/wesconfig.h +++ b/src/wesconfig.h @@ -23,7 +23,7 @@ #ifdef VERSION #undef VERSION #endif -#define VERSION "1.12.3+dev" +#define VERSION "1.12.4" #ifndef PACKAGE #define PACKAGE "wesnoth" #endif