(svn r21749) -Prepare: for 1.1.0-beta3

6 files changed, 45 insertions, 14 deletions

diff --git a/changelog.txt b/changelog.txt
index b1fa8da38..c10282c4a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,28 @@
+1.1.0-beta3 (2011-01-09)
+------------------------------------------------------------------------
+- Feature: Configurable limit amount of tiles that can be cleared/terraformed by a company [FS#4331] (r21728)
+- Feature: Show a list of companies in the owner legend and allow them to be toggled for visibility (r21720, r21718)
+- Feature: Console command 'list_ai_libs' to get a list of recognized AI libraries [FS#4372] (r21703)
+- Feature: Allow changing the AI configuration in the scenario editor / in game [FS#4362] (r21696)
+- Change: Tune 'realistic' acceleration even more to make more trains reach their top speed, and make it behave more like TTDPatch (r21712)
+- Change: Display the minimum height of the tile in the LandInfo window instead of the height of the northern corner. So it is more useful for NewGRF and AI developers, and maybe more transparent for players (r21711)
+- Fix: The diagonal iterator would iterate twice over some tiles [FS#4395] (r21747)
+- Fix: [NewGRF] Canal variable 83 accessed water random bits also for non-water tiles (e.g. watery industries or objects) (r21746)
+- Fix: [NewGRF] Canal variable 80 shall return consistent heights within a lock (r21745)
+- Fix: Allow Ctrl+Clicking automatic orders for scrolling to their destination (r21744)
+- Fix: Coast tiles were not drawn under bridges [FS#4386] (r21743)
+- Fix: Make clearing refit orders work again [FS#4388] (r21739)
+- Fix: Start loading when cur_order_index points to the destination station, i.e. after deleting not-reached automatic orders [FS#4384] (r21738)
+- Fix: A loading order was also marked as 'not part of orders' when the order before the current order was deleted (r21737)
+- Fix: Admin bots were not always notified of password changes [FS#4377] (r21727)
+- Fix: Vehicle sprite was cached into a 16 bit variable, causing incorrect sprites to be displayed (r21709)
+- Fix: [NewGRF] Report TTDPatch flag 4A (newobjects) as set (r21708)
+- Fix: The old ship pathfinder is too stupid to provide 'lost' notices; it would even get lost while following its own path [FS#4370] (r21706)
+- Fix: Do not perform any more checks after the connection is closed [FS#4374] (r21704)
+- Fix: Changing AI settings ingame was impossible when the difficulty level was other than custom (r21694)
+- Fix: Due to an error in the Debian changelog building of Debian/Ubuntu packages failed (r21682)
+
+
 1.1.0-beta2 (2010-12-31)
 ------------------------------------------------------------------------
 - Feature: Command logging using the admin interface (r21668)
diff --git a/known-bugs.txt b/known-bugs.txt
index 7da07d8da..2fa9d3837 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,13 +1,13 @@
 OpenTTD's known bugs
-Last updated:    2010-12-31
-Release version: 1.1.0-beta2
+Last updated:    2010-01-09
+Release version: 1.1.0-beta3
 ------------------------------------------------------------------------
 
 
 Table of Contents:
 ------------------
 1) About
-2) Known bugs in the this stable release
+2) Known bugs in this release
 3) Known bugs that will not be solved
 
 
@@ -22,12 +22,12 @@ 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 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
-in the "Known bugs that will not be solved" section.
+2) Known bugs in this release:
+-- ---------------------------
+The following bugs are known to exist in this 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 in the "Known bugs that
+will not be solved" section.
 
 The bugs in this section all refer to a ticket in our bug tracking system
 that you can find at: http://bugs.openttd.org
diff --git a/os/debian/changelog b/os/debian/changelog
index 81cf9fde7..c06663577 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.1.0~beta3) unstable; urgency=low
+
+  * New upstream release 1.1.0-beta3
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 09 Jan 2011 18:00:00 +0100
+
 openttd (1.1.0~beta2) unstable; urgency=low
 
   * New upstream release 1.1.0-beta2
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 0437eb18b..8ae93824b 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.0-beta2
+set OPENTTD_VERSION=1.1.0-beta3
 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 811431bbe..174a780df 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 0
-!define APPV_BUILD 1
-!define APPV_EXTRA "-beta2"
+!define APPV_BUILD 2
+!define APPV_EXTRA "-beta3"
 
 !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 dbe022922..329460eb3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-12-31
-Release version: 1.1.0-beta2
+Last updated:    2011-01-09
+Release version: 1.1.0-beta3
 ------------------------------------------------------------------------