From eb7bceb2400e6b03187eec616a76645cef611b29 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 14 Aug 2011 15:23:27 +0000
Subject: [PATCH] (svn r22748) [1.1] -Prepare: 1.1.2

---
 changelog.txt                       | 6 ++++++
 known-bugs.txt                      | 4 ++--
 os/debian/changelog                 | 6 ++++++
 os/os2/installer/make_installer.cmd | 2 +-
 os/windows/installer/install.nsi    | 4 ++--
 readme.txt                          | 4 ++--
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index ee0428c6e5..8afab9828f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+1.1.2 (2011-08-14)
+------------------------------------------------------------------------
+- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [FS#4717] (r22737, r22736)
+- Fix: [NewGRF] Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735)
+
+
 1.1.2-RC2 (2011-07-30)
 ------------------------------------------------------------------------
 - Fix: Cost of adding an extra road type to a bridge or tunnel was undercalculated [FS#4680, FS#4681] (r22700, r22699)
diff --git a/known-bugs.txt b/known-bugs.txt
index c9389bb13e..55a7a36d0c 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-07-30
-Release version: 1.1.2-RC2
+Last updated:    2011-08-14
+Release version: 1.1.2
 ------------------------------------------------------------------------
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index 9d1293c2bf..f723ce1373 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.1.2) unstable; urgency=low
+
+  * New upstream release 1.1.2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Aug 2011 17:00:00 +0200
+
 openttd (1.1.2~RC2) unstable; urgency=low
 
   * New upstream release 1.1.2-RC2
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 902e6ca11d..a46476cf69 100644
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.1.2-RC2
+set OPENTTD_VERSION=1.1.2
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index d33d67af6e..a2ebadb0c7 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 1
 !define APPV_MAINT 2
-!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 059ba544b7..84105cf44f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-07-30
-Release version: 1.1.2-RC2
+Last updated:    2011-08-14
+Release version: 1.1.2
 ------------------------------------------------------------------------