From f6908d9c2db6619fd6557f6d246ca71c2aecfff4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 20 Nov 2010 20:22:57 +0000 Subject: [PATCH] (svn r21278) [1.0] -Prepare for 1.0.5 --- changelog.txt | 7 ++++++- known-bugs.txt | 8 ++++---- os/debian/changelog | 6 ++++++ os/windows/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/changelog.txt b/changelog.txt index 03d8c91cd4..ff5231eb5c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,11 @@ +1.0.5 (2010-11-20) +------------------------------------------------------------------------ +(None) + + 1.0.5-RC2 (2010-11-14) ------------------------------------------------------------------------ -- Fix: Reading (very) recently freed memory (r21182) +- Fix: Reading (very) recently freed memory [CVE-2010-4168] (r21182) - Fix: Default service interval for ships/aircraft got switched [FS#4222] (r21155) - Fix: Size of sort buttons for save/load and build vehicle list gui could be too small [FS#4221] (r21151) - Fix: [NewGRF] Crash when disabling static NewGRFs (when joining/starting a server) [FS#4208] (r21130, r21129, r21128) diff --git a/known-bugs.txt b/known-bugs.txt index bb419df136..c9406cac8f 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2010-11-14 -Release version: 1.0.5-RC2 +Last updated: 2010-11-20 +Release version: 1.0.5 ------------------------------------------------------------------------ @@ -22,8 +22,8 @@ specifics, we welcome you to report them. React to the given bug indicated by the number below on http://bugs.openttd.org. -2) Known bugs in the this stable release: --- -------------------------------------- +2) Known bugs in this stable release: +-- ---------------------------------- The following bugs are known to exist in this stable release and we intend to fix them. Some bugs are known but are not fixable or fixing them would cause further problems. Those bugs can be found diff --git a/os/debian/changelog b/os/debian/changelog index a5ef5f9183..c3b20e8569 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.0.5-0) unstable; urgency=low + + * New upstream release 1.0.5 + + -- Matthijs Kooijman Sat, 20 Nov 2010 21:00:00 +0000 + openttd (1.0.5~rc2-0) unstable; urgency=low * New upstream release 1.0.5~rc2 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 8591e8bae5..5e75b04784 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 0 !define APPV_MAINT 5 -!define APPV_BUILD 1 -!define APPV_EXTRA "-RC2" +!define APPV_BUILD 2 +!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 8e0d1a6346..4b46cd8476 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD README -Last updated: 2010-11-14 -Release version: 1.0.5-RC2 +Last updated: 2010-11-20 +Release version: 1.0.5 ------------------------------------------------------------------------