merge 1.5.3-RC1

This commit is contained in:
Pavel Stupnikov
2015-11-01 21:17:36 +03:00
62 changed files with 767 additions and 1268 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: rev.cpp.in 27393 2015-09-01 18:31:52Z frosch $ */
/* $Id: rev.cpp.in 27434 2015-11-01 12:11:51Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -72,7 +72,7 @@ const byte _openttd_revision_modified = 0;
* final release will always have a lower version number than the released
* version, thus making comparisons on specific revisions easy.
*/
const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 2 << 20 | 1 << 19 | (!!REVISION!! & ((1 << 19) - 1));
const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 3 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
#ifdef __MORPHOS__
/**