From 9d2f06c42cc0af7a78667c9a04ea4a0ebf0c7d36 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 1 Apr 2014 18:29:34 +0000 Subject: [PATCH] (svn r26439) [1.4] -Update documentation --- changelog.txt | 7 ++++++- known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/windows/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- src/script/api/ai_changelog.hpp | 2 -- src/script/api/game_changelog.hpp | 2 -- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/changelog.txt b/changelog.txt index 842ffc5377..1da7d4d1b2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,12 @@ +1.4.0 (2014-04-01) +------------------------------------------------------------------------ +(None) + + 1.4.0-RC1 (2014-03-18) ------------------------------------------------------------------------ - Feature: [Script] APIs to get cargo waiting from/via other station (r26396) -- Fix: Don't explain "symmetric" cargodist mode when the setting does not allow it [FS#5939] (r26394) +- Fix: Do not explain "symmetric" cargodist mode when the setting does not allow it [FS#5939] (r26394) - Fix: Update distances between link graph nodes when station sign is moved (r26393) - Fix: No need to call OnFocus twice [FS#5933] (r26392) - Fix: Select a specific font size when freetype fails to select one automatically [FS#5885] (r26389) diff --git a/known-bugs.txt b/known-bugs.txt index 21d82e8e57..0a884cb738 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2014-03-17 -Release version: 1.4.0-RC1 +Last updated: 2014-04-01 +Release version: 1.4.0 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 9d8561e3af..1ff0deed6c 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.4.0-0) unstable; urgency=low + + * New upstream release 1.4.0 + + -- OpenTTD Tue, 01 Apr 2014 21:00:00 +0200 + openttd (1.4.0~RC1-0) unstable; urgency=low * New upstream release 1.4.0-RC1 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 7a4da6aa01..30fbc653ec 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 4 !define APPV_MAINT 0 -!define APPV_BUILD 5 -!define APPV_EXTRA "-RC1" +!define APPV_BUILD 6 +!define APPV_EXTRA "" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/readme.txt b/readme.txt index b44280a9ba..8a6ae58ac6 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ -Last updated: 2014-03-17 -Release version: 1.4.0-RC1 +Last updated: 2014-04-01 +Release version: 1.4.0 ------------------------------------------------------------------------ diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index e73857dbff..9363ea223f 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -17,8 +17,6 @@ * * \b 1.4.0 * - * 1.4.0 is not yet released. The following changes are not set in stone yet. - * * API additions: * \li AICargo::GetDistributionType * \li AIDate::DATE_INVALID diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index f6064a1bd0..4d69c32e86 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -17,8 +17,6 @@ * * \b 1.4.0 * - * 1.4.0 is not yet released. The following changes are not set in stone yet. - * * API additions: * \li AICargo::GetDistributionType * \li GSCompany::ChangeBankBalance