From 041714e53829eff2598e4daa24c4fcf06894a0bd Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Tue, 31 May 2011 19:25:02 +0000
Subject: [PATCH] (svn r22527) [1.1] -Prepare for 1.1.1

---
 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 c0959f32f1..f1680b9aa4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+1.1.1 (2011-06-01)
+------------------------------------------------------------------------
+- Change: Automatic orders are better called implicit orders as no real order influencing path finding is added (r22474, r22473)
+- Fix: Only try to insert implicit orders for ground vehicles. Aircraft may reach unscheduled terminals when skipping orders [FS#4624] (r22492)
+
+
 1.1.1-RC1 (2011-05-15)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Allow to filter by town of the current industry when using industry variable 0x68 [FS#4591] (r22434)
diff --git a/known-bugs.txt b/known-bugs.txt
index 2588f004a1..1b629eee0a 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2011-05-15
-Release version: 1.1.1-RC1
+Last updated:    2011-06-01
+Release version: 1.1.1
 ------------------------------------------------------------------------
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index ceff4aa7ee..cff00458a9 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.1.1) unstable; urgency=low
+
+  * New upstream release 1.1.1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Jun 2011 00:00:00 +0200
+
 openttd (1.1.1~RC1) unstable; urgency=low
 
   * New upstream release 1.1.1-RC1
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 1e0cd1d9bc..3fe709bb5e 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.1-RC1
+set OPENTTD_VERSION=1.1.1
 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 941699038a..5628aa7d98 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 1
-!define APPV_BUILD 0
-!define APPV_EXTRA "-RC1"
+!define APPV_BUILD 1
+!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 8a1baa2c5f..cdbed0f2cf 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2011-05-15
-Release version: 1.1.1-RC1
+Last updated:    2011-06-01
+Release version: 1.1.1
 ------------------------------------------------------------------------