summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-06-19 11:45:44 +0000
committerrubidium <rubidium@openttd.org>2008-06-19 11:45:44 +0000
commitad8578419e37e31b44a5cfc7e1ec4fcf1e0fca7f (patch)
treebe02c38c9b0aee8d95bf560dd1626deb78cc456b /os
parentbf826eb06e41ded4bceb8580495fa26684ba8ee9 (diff)
downloadopenttd-ad8578419e37e31b44a5cfc7e1ec4fcf1e0fca7f.tar.xz
(svn r13578) -Merge: documentation updates from the 0.6 branch.
Diffstat (limited to 'os')
-rw-r--r--os/debian/changelog30
-rw-r--r--os/win32/installer/install.nsi6
2 files changed, 33 insertions, 3 deletions
diff --git a/os/debian/changelog b/os/debian/changelog
index a31e64c18..8d83895f0 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -4,6 +4,36 @@ openttd (0.7~svn) unstable; urgency=low
-- Matthijs Kooijman <m.kooijman@student.utwente.nl> Sat, 22 Mar 2007 21:07:05 +0100
+openttd (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Sun, 01 Jun 2008 15:35:00 +0200
+
+openttd (0.6.1~RC2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Wed, 21 May 2008 00:05:00 +0200
+
+openttd (0.6.1~RC1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Sat, 26 Apr 2008 22:55:00 +0200
+
+openttd (0.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Tue, 01 Apr 2008 13:33:37 +0100
+
+openttd (0.6.0~RC1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Wed, 26 Mar 2008 15:51:40 +0100
+
openttd (0.6.0~beta5) unstable; urgency=low
* New upstream release.
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 747695e08..a31b8a9cf 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,9 +1,9 @@
!define APPNAME "OpenTTD" ; Define application name
-!define APPVERSION "0.6.0" ; Define application version
-!define INSTALLERVERSION 43 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "0.6.1" ; Define application version
+!define INSTALLERVERSION 48 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
!define APPURLLINK "http://www.openttd.org"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-beta5"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
!define MUI_ICON "..\..\..\media\openttd.ico"