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

changelog.txt

@@ -1,6 +1,11 @@
+1.2.2 (2012-08-16)
+------------------------------------------------------------------------
+(None)
+
+
 1.2.2-RC1 (2012-08-01)
 ------------------------------------------------------------------------
-- Fix: In some cases ships could be covered with land [FS#5254] (r24449, r24439)
+- Fix: In some cases ships could be covered with land [CVE-2012-3436] [FS#5254] (r24449, r24439)
 - Fix: Copy constructor and assignment operator cannot be implicit template specialisations [FS#5255] (r24448)
 - Fix: Make (non-refittable) vehicles with invalid default cargo unavailable [FS#5256] (r24438)
 - Fix: CFLAGS/CXXFLAGS ignored for helper binaries (r24432, r24429, r24427, r24365)

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.2.2) unstable; urgency=low
+
+  * New upstream release 1.2.2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 16 Aug 2012 20:00:00 +0200
+
 openttd (1.2.2~RC1) unstable; urgency=low
 
   * New upstream release 1.2.2-RC1

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.2.2-RC1
+set OPENTTD_VERSION=1.2.2
 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,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
 !define APPV_MAINT 2
-!define APPV_BUILD 0
-!define APPV_EXTRA "-RC1"
+!define APPV_BUILD 1
+!define APPV_EXTRA ""
 
 !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-08-01
-Release version: 1.2.2-RC2
+Last updated:    2012-08-16
+Release version: 1.2.2
 ------------------------------------------------------------------------