summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-12-24 08:56:18 +0000
committerrubidium <rubidium@openttd.org>2011-12-24 08:56:18 +0000
commit2bbbff64e4b0c2185168a7f1ad4c7bce669e1b1a (patch)
treec450808e62ffc7fa68d37114fb02479bddb35228 /os
parent7702151a62e739b07805c738901bce9fef660fb2 (diff)
downloadopenttd-2bbbff64e4b0c2185168a7f1ad4c7bce669e1b1a.tar.xz
(svn r23666) -Document: the usual pre-Christmas documentation spree
Diffstat (limited to 'os')
-rw-r--r--os/debian/changelog6
-rw-r--r--os/os2/installer/make_installer.cmd2
-rw-r--r--os/windows/installer/install.nsi2
3 files changed, 5 insertions, 5 deletions
diff --git a/os/debian/changelog b/os/debian/changelog
index d53823593..2f21f1133 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,8 +1,8 @@
-openttd (1.2.0~alpha) unstable; urgency=low
+openttd (1.2.0~beta1) unstable; urgency=low
- * Alpha releases of trunk leading to 1.2.0-beta1
+ * New upstream release 1.2.0-beta1
- -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 05 Dec 2011 00:00:01 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl> Fri, 24 Dec 2011 00:00:00 +0100
openttd (1.1.4) unstable; urgency=low
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 1d1d318ad..cd24f07ab 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.2.0-alpha
+set OPENTTD_VERSION=1.2.0-beta1
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 f88ff8563..14fc89397 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -3,7 +3,7 @@
!define APPV_MINOR 2
!define APPV_MAINT 0
!define APPV_BUILD 0
-!define APPV_EXTRA "-alpha"
+!define APPV_EXTRA "-beta1"
!define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version