(svn r24117) [1.2] -Update: some documentation

changelog.txt

@@ -1,3 +1,10 @@
+1.2.0 (2012-04-15)
+------------------------------------------------------------------------
+- Fix: When starting GS or AI, always use the settings of the game, not the new-game settings [FS#5142] (r24108)
+- Fix: Provide translated comments in the desktop file without language name postfix (r24100)
+- Fix: Cloning orders of aircraft with limited range failed [FS#5131] (r24086)
+
+
 1.2.0-RC4 (2012-04-01)
 ------------------------------------------------------------------------
 - Fix: Reversing trains while they were entering or leaving a depot could lead to stuck trains [FS#5093] (r24078, r24071)

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-04-01
+Last updated:    2012-04-15
-Release version: 1.2.0-RC4
+Release version: 1.2.0
 ------------------------------------------------------------------------
 
 
@@ -39,6 +39,7 @@ officially supporting Mac OS X again. For now it remains unsupported and
 we only apply bug fixes provided by the community but we are unable to fix
 these bugs ourselves.
 
+- 5154	Crash about old language when there is an error in misc settings
 - 4857	[OSX] No support for detecting mono space font
 - 4847	[OSX] No support for bootstrap downloading of base graphics
 - 4744  [OSX] Crash when switching to full screen with OS X Lion

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.2.0) unstable; urgency=low
+
+  * New upstream release 1.2.0
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Apr 2012 14:00:00 +0200
+
 openttd (1.2.0~RC4) unstable; urgency=low
 
   * New upstream release 1.2.0-RC4

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.2.0-RC4
+set OPENTTD_VERSION=1.2.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/windows/installer/install.nsi

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

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-04-01
+Last updated:    2012-04-15
-Release version: 1.2.0-RC4
+Release version: 1.2.0
 ------------------------------------------------------------------------
 
 

src/script/api/ai_changelog.hpp

@@ -17,8 +17,6 @@
  *
  * \b 1.2.0
  *
- * 1.2.0 is not yet released. The following changes are not set in stone yet.
- *
  * API additions:
  *
  * \li AIAirport::GetMaintenanceCostFactor
@@ -71,6 +69,19 @@
  * \li AITown::GetLastMonthTransportedPercentage no longer has prerequisites
  *     based on town effects.
  *
+ * \b 1.1.5
+ *
+ * No changes
+ *
+ * \b 1.1.4
+ *
+ * API additions:
+ * \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached.
+ *
+ * \b 1.1.3
+ *
+ * No changes
+ *
  * \b 1.1.2
  *
  * No changes