Merge branch 'cpp-11' into crashlog_improvements

# Conflicts: # config.lib
2017-09-04 01:22:54 +01:00
parent 2f85326a4a 509e20406f
commit 4a6ddb2d50
301 changed files with 6351 additions and 4178 deletions
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -78,7 +78,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
 * 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 | 7 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));

 #ifdef __MORPHOS__
 /**