diff options
| author | rubidium <rubidium@openttd.org> | 2009-06-08 23:58:53 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-06-08 23:58:53 +0000 |
| commit | 394e405bdd9a3b02437996b72506669951e93d01 (patch) | |
| tree | b3442a1fec2dea124443f6d7f01f46964214557a /os | |
| parent | afdeab52ab8331680a241c10421a4dd583182dec (diff) | |
| download | openttd-394e405bdd9a3b02437996b72506669951e93d01.tar.xz | |
(svn r16541) -Merge: changelog etc. changes from 0.7 branch
Diffstat (limited to 'os')
| -rw-r--r-- | os/debian/changelog | 48 | ||||
| -rw-r--r-- | os/win32/installer/install.nsi | 13 |
2 files changed, 48 insertions, 13 deletions
diff --git a/os/debian/changelog b/os/debian/changelog index 07efb9ecd..6af62d4d9 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,17 +1,59 @@ -openttd (0.7~svn-1) UNRELEASED; urgency=low +openttd (0.8~svn-1) UNRELEASED; urgency=low * Unreleased SVN version. Versioned to allow normal upgrades to released versions. -- Matthijs Kooijman <matthijs@stdin.nl> Wed, 03 Sep 2008 18:56:04 +0200 -openttd (0.7.0-beta2) unstable; urgency=low +openttd (0.7.1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Tue, 09 Jun 2008 01:34:56 +0200 + +openttd (0.7.1~RC3) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Wed, 03 Jun 2008 15:34:56 +0200 + +openttd (0.7.1~RC2) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Thu, 21 Mar 2008 14:34:56 +0200 + +openttd (0.7.1~RC1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 11 Mar 2008 17:34:56 +0200 + +openttd (0.7.0) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Wed, 01 Apr 2008 13:37:42 +0000 + +openttd (0.7.0~RC2) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 23 Mar 2008 00:42:00 +0200 + +openttd (0.7.0~RC1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 16 Mar 2008 00:07:00 +0200 + +openttd (0.7.0~beta2) unstable; urgency=low * New upstream release. -- Matthijs Kooijman <matthijs@stdin.nl> Tue, 10 Mar 2009 00:33:05 +0100 -openttd (0.7.0-beta1) unstable; urgency=low +openttd (0.7.0~beta1) unstable; urgency=low * New upstream release. diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 800af12c3..6de16a16e 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -1,11 +1,11 @@ !define APPNAME "OpenTTD" ; Define application name -!define APPVERSION "0.7.0" ; Define application version -!define INSTALLERVERSION 55 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! +!define APPVERSION "0.7.1" ; Define application version +!define APPVERSIONINTERNAL "0.7.1.0" ; Define application version in X.X.X.X +!define INSTALLERVERSION 62 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! !include ${VERSION_INCLUDE} !define APPURLLINK "http://www.openttd.org" !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}" -!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X !define MUI_ICON "..\..\..\media\openttd.ico" !define MUI_UNICON "..\..\..\media\openttd.ico" @@ -112,13 +112,6 @@ Section "!OpenTTD" Section1 File ${PATH_ROOT}bin\data\*.grf File ${PATH_ROOT}bin\data\*.obg File ${PATH_ROOT}bin\data\opntitle.dat - ; Copy scenario files (don't choke if they don't exist) - SetOutPath "$INSTDIR\scenario\" - File /nonfatal ${PATH_ROOT}bin\scenario\*.scn - - ; Copy heightmap files (don't choke if they don't exist) - SetOutPath "$INSTDIR\scenario\heightmap\" - File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.* ; Copy the scripts SetOutPath "$INSTDIR\scripts\" |