diff options
author | rubidium <rubidium@openttd.org> | 2011-02-14 20:20:57 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-02-14 20:20:57 +0000 |
commit | 22afd8396407ce1d8e738833a60f180b526a8550 (patch) | |
tree | 93b502b1ae72cfb272233347d86081a7a30ca005 /os | |
parent | 1b2ef664162a4b9e684c8847e80db4269e97beec (diff) | |
download | openttd-22afd8396407ce1d8e738833a60f180b526a8550.tar.xz |
(svn r22083) -Change: trunk is heading towards 1.2 now
Diffstat (limited to 'os')
-rw-r--r-- | os/debian/changelog | 6 | ||||
-rw-r--r-- | os/os2/installer/make_installer.cmd | 2 | ||||
-rw-r--r-- | os/rpm/openttd.spec | 2 | ||||
-rw-r--r-- | os/windows/installer/install.nsi | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/os/debian/changelog b/os/debian/changelog index f000f2f81..7561244af 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.2.0~alpha) unstable; urgency=low + + * Alpha releases of trunk leading to 1.2.0-beta1 + + -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 14 Feb 2011 22:00:00 +0100 + openttd (1.1.0~beta5) unstable; urgency=low * New upstream release 1.1.0-beta5 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 8ec90e69b..1d1d318ad 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-beta5 +set OPENTTD_VERSION=1.2.0-alpha set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index bf9ee3e53..362d7f612 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -13,7 +13,7 @@ #------------------------------------------------------------------------------- Name: openttd -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Group: Amusements/Games diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index bb76d998c..071fd1cd7 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -1,9 +1,9 @@ # Version numbers to update !define APPV_MAJOR 1 -!define APPV_MINOR 1 +!define APPV_MINOR 2 !define APPV_MAINT 0 -!define APPV_BUILD 4 -!define APPV_EXTRA "-beta5" +!define APPV_BUILD 0 +!define APPV_EXTRA "-alpha" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version |