(svn r9700) -Merge: Release changes from 0.5 branch back to trunk.

5 files changed, 14 insertions, 10 deletions

diff --git a/changelog.txt b/changelog.txt
index 24f557b65..fb41e525e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+0.5.1 (2007-04-20)
+------------------------------------------------------------------------
+(None)
+
 0.5.1-RC3 (2007-04-17)
 ------------------------------------------------------------------------
 - Feature: Add list_patches to console commands; shows all patches and values (r9565)
@@ -1352,7 +1356,6 @@
 
 0.2.1 (2004-04-04)
 ------------------------------------------------------------------------
-
 - Fix: copy orders crashed if you clicked on a wagon
 - Feature: 'A' hotkey now always opens autorail
 - Change: Moved autorail button
@@ -1365,7 +1368,6 @@
 
 0.2 (2004-04-03)
 ------------------------------------------------------------------------
-
 - Feature: autoscroll (only works to left/right)
 - Feature: train checkpoints, instead of ttdpatch's nonstop handling
 - Feature: ttdpatch compatible nonstop handling
@@ -1426,7 +1428,6 @@
 
 0.1.4 (2004-03-25)
 ------------------------------------------------------------------------
-
 - Feature: crash submit system on win32
 - Fix: train smoke clouds
 - Fix: train engine sounds
@@ -1467,7 +1468,6 @@
 
 0.1.3 (2004-03-18)
 ------------------------------------------------------------------------
-
 - Fixed message options window
 - Fixed company takeover/purchase
 - Feature: Improved mouse scroll zooming
@@ -1491,7 +1491,6 @@
 
 0.1.2 (2004-03-15)
 ------------------------------------------------------------------------
-
 - Mouse wheel can be used to zoom in out on win32 (ludde)
 - Implemented some support for resizing the window dynamically in win32 (ludde)
 - Fixed tunnel mouse icon for maglev and monorail
@@ -1499,7 +1498,6 @@
 
 0.1.1 (2004-03-14)
 ------------------------------------------------------------------------
-
 - Preliminary presignal support
 - Added external MIDI driver for unix version (by robertnorris)
 - Added DirectMusic driver for Win32 version
diff --git a/docs/openttd.6 b/docs/openttd.6
index c52208d2d..de9574943 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd April 17, 2007
+.Dd April 20, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
diff --git a/os/debian/changelog b/os/debian/changelog
index cf54c9838..f460f4553 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -4,6 +4,12 @@ openttd (0.6~svn) unstable; urgency=low
 
  -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100
 
+openttd (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 20 Aprr 2007 21:45:32 +0100
+
 openttd (0.5.1~rc3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 40fcd3404..7fff85f9e 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,6 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "0.5.1"  ; Define application version
-!define INSTALLERVERSION 31 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 32 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 
 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
diff --git a/readme.txt b/readme.txt
index 6b86c9211..a303c5673 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2007-04-17
-Release version: 0.5.1-RC3
+Last updated:    2007-04-20
+Release version: 0.5.1
 ------------------------------------------------------------------------