Merge branch 'openttd'

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.10.0~beta2-0) unstable; urgency=low
+
+  * New upstream release 1.10.0-beta2
+
+ -- OpenTTD <info@openttd.org>  Wed, 25 Dec 2019 00:00:00 +0000
+
 openttd (1.10.0~beta1-0) unstable; urgency=low
 
   * New upstream release 1.10.0-beta1

os/macosx/plistgen.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
 # sets VERSION to the value if RELEASE if there are any,
 # otherwise it sets VERSION to revision number
 if [ "$3" ]; then

os/rpm/openttd.spec

@@ -17,9 +17,9 @@
 #
 
 Name:           openttd
-Version:        1.10.beta1
+Version:        1.10.beta2
 Release:        0
-%define srcver  1.10.0-beta1
+%define srcver  1.10.0-beta2
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other

os/windows/installer/install.nsi

@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 10
 !define APPV_MAINT 0
-!define APPV_BUILD 0
-!define APPV_EXTRA "-beta1"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-beta2"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version