Merge branch 'master' into jgrpp

# Conflicts: # src/console_gui.cpp # src/lang/korean.txt # src/video/sdl2_v.cpp # src/video/sdl2_v.h # src/window.cpp # src/window_gui.h
5 years ago · cbdd9f84d8
parent ea587bc112 4eab70f84e
commit cbdd9f84d8
1409 changed files with 224 additions and 2907 deletions
--- a/2
+++ b/2
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.in
+++ b/Makefile.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.msvc
+++ b/Makefile.msvc
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/Makefile.src.in
+++ b/Makefile.src.in
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/azure-pipelines/changelog.sh
+++ b/azure-pipelines/changelog.sh
@ -4,9 +4,9 @@ tag=$(git describe --tags 2>/dev/null)
 # If we are a tag, show the part of the changelog till (but excluding) the last stable
 if [ -n "$tag" ]; then
-    grep='^[0-9]\.[0-9]\.[0-9][^-]'
+    grep='^[0-9]\+\.[0-9]\+\.[0-9]\+[^-]'
    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
-    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9].[0-9].[0-9]/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
+    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
    exit 0
 fi
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.10.nut
+++ b/bin/ai/compat_1.10.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.2.nut
+++ b/bin/ai/compat_1.2.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.3.nut
+++ b/bin/ai/compat_1.3.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.4.nut
+++ b/bin/ai/compat_1.4.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.5.nut
+++ b/bin/ai/compat_1.5.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.6.nut
+++ b/bin/ai/compat_1.6.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.7.nut
+++ b/bin/ai/compat_1.7.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.8.nut
+++ b/bin/ai/compat_1.8.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/compat_1.9.nut
+++ b/bin/ai/compat_1.9.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/ai/regression/completeness.sh
+++ b/bin/ai/regression/completeness.sh
@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 if ! [ -f ai/regression/completeness.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 if ! [ -f ai/regression/run.sh ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
--- a/bin/ai/regression/run.vbs
+++ b/bin/ai/regression/run.vbs
@ -1,7 +1,5 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/bin/ai/regression/tst_regression/main.nut
+++ b/bin/ai/regression/tst_regression/main.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIController {
 	function Start();
 };
--- a/bin/ai/regression/tst_regression/require.nut
+++ b/bin/ai/regression/tst_regression/require.nut
@ -1,4 +1,2 @@
 /* $Id$ */
 print("  Required this file");
--- a/bin/ai/regression/tst_stationlist/main.nut
+++ b/bin/ai/regression/tst_stationlist/main.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 class Regression extends AIController {
 	function Start();
 };
--- a/bin/game/compat_1.10.nut
+++ b/bin/game/compat_1.10.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.5.nut
+++ b/bin/game/compat_1.5.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.8.nut
+++ b/bin/game/compat_1.8.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/bin/game/compat_1.9.nut
+++ b/bin/game/compat_1.9.nut
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/changelog.txt
+++ b/changelog.txt
@ -11,7 +11,6 @@
 - Feature: Improved performance for road vehicle pathfinding (#7261)
 - Feature: Option to show local authority boundary of towns (#7025)
 - Feature: Experimental method of town cargo generation that scales linearly with population (#6965)
 - Feature: [NewGRF] Houses and industries can accept/produce up to 16 different cargo types (#6867, #6872)
 - Feature: [NewGRF] RoadTypes (NRT) (#6811)
 - Add: [Win32] Select MIDI device by port name (#7666)
 - Add: 'getsysdate' console command (#7658)
--- a/config.lib
+++ b/config.lib
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/2
+++ b/2
@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/findversion.sh
+++ b/findversion.sh
@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/baseset/no_music.obm
+++ b/media/baseset/no_music.obm
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents more or less nothingness
 ;
 [metadata]
--- a/media/baseset/no_sound.obs
+++ b/media/baseset/no_sound.obs
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents more or less nothingness
 ;
 [metadata]
--- a/media/baseset/orig_dos.obg
+++ b/media/baseset/orig_dos.obg
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the non-German Transport
 ; Tycoon Deluxe DOS CD.
 ;
--- a/media/baseset/orig_dos.obm
+++ b/media/baseset/orig_dos.obm
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for DOS CD.
 ;
--- a/media/baseset/orig_dos.obs
+++ b/media/baseset/orig_dos.obs
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original sounds as on the Transport
 ; Tycoon Deluxe DOS CD.
 ;
--- a/media/baseset/orig_dos_de.obg
+++ b/media/baseset/orig_dos_de.obg
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the German Transport
 ; Tycoon Deluxe DOS CD. It contains one broken sprite.
 ;
--- a/media/baseset/orig_tto.obm
+++ b/media/baseset/orig_tto.obm
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon (with World Editor) for DOS CD.
 ;
--- a/media/baseset/orig_win.obg
+++ b/media/baseset/orig_win.obg
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/orig_win.obm
+++ b/media/baseset/orig_win.obm
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/orig_win.obs
+++ b/media/baseset/orig_win.obs
@ -1,5 +1,3 @@
 ; $Id$
 ;
 ; This represents the original sounds as on the Transport
 ; Tycoon Deluxe for Windows CD.
 ;
--- a/media/baseset/translations.awk
+++ b/media/baseset/translations.awk
@ -1,5 +1,3 @@
 # $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z rubidium $
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/2ccmap.nfo
+++ b/media/extra_grf/2ccmap.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airport_preview.nfo
+++ b/media/extra_grf/airport_preview.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airports.nfo
+++ b/media/extra_grf/airports.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/airports_orig_extra.nfo
+++ b/media/extra_grf/airports_orig_extra.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/aqueduct.nfo
+++ b/media/extra_grf/aqueduct.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/assemble_nfo.awk
+++ b/media/extra_grf/assemble_nfo.awk
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/autorail.nfo
+++ b/media/extra_grf/autorail.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/canals_extra.nfo
+++ b/media/extra_grf/canals_extra.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/chars.nfo
+++ b/media/extra_grf/chars.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/chars_orig_extra.nfo
+++ b/media/extra_grf/chars_orig_extra.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/elrails.nfo
+++ b/media/extra_grf/elrails.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/flags.nfo
+++ b/media/extra_grf/flags.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/foundations.nfo
+++ b/media/extra_grf/foundations.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/mono.nfo
+++ b/media/extra_grf/mono.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/oneway.nfo
+++ b/media/extra_grf/oneway.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@ -2,8 +2,6 @@
 // (Info version 32)
 // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/orig_extra.nfo
+++ b/media/extra_grf/orig_extra.nfo
@ -2,8 +2,6 @@
 // (Info version 32)
 // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/palette.nfo
+++ b/media/extra_grf/palette.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/arctic.nfo
+++ b/media/extra_grf/rivers/arctic.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/rapids.nfo
+++ b/media/extra_grf/rivers/rapids.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/temperate.nfo
+++ b/media/extra_grf/rivers/temperate.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/toyland.nfo
+++ b/media/extra_grf/rivers/toyland.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/rivers/tropic.nfo
+++ b/media/extra_grf/rivers/tropic.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/roadstops.nfo
+++ b/media/extra_grf/roadstops.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/signals.nfo
+++ b/media/extra_grf/signals.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/sloped_tracks.nfo
+++ b/media/extra_grf/sloped_tracks.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/tramtracks.nfo
+++ b/media/extra_grf/tramtracks.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/extra_grf/tunnel_portals.nfo
+++ b/media/extra_grf/tunnel_portals.nfo
@ -1,6 +1,3 @@
 //
 // $Id$
 //
 // This file is part of OpenTTD.
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/openttd.desktop.filter.awk
+++ b/media/openttd.desktop.filter.awk
@ -1,5 +1,3 @@
 # $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@ -1,4 +1,3 @@
 # $Id$
 # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html
 [Desktop Entry]
 Type=Application
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@ -1,5 +1,3 @@
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/os/macosx/plistgen.sh
+++ b/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
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@ -1,7 +1,5 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/projects/gen-kdev4.sh
+++ b/projects/gen-kdev4.sh
@ -1,7 +1,5 @@
 #!/bin/sh
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/projects/generate
+++ b/projects/generate
@ -1,7 +1,5 @@
 #!/bin/bash
 # $Id$
 # This file is part of OpenTTD.
 # OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@ -1,7 +1,5 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/src/3rdparty/md5/md5.cpp
+++ b/src/3rdparty/md5/md5.cpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /** @file md5.cpp Creating MD5 checksums of files. */
 /*
--- a/src/3rdparty/md5/md5.h
+++ b/src/3rdparty/md5/md5.h
@ -1,5 +1,3 @@
 /* $Id$ */
 /** @file md5.h Functions to create MD5 checksums. */
 /*
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/src/ai/ai_gui.hpp
+++ b/src/ai/ai_gui.hpp
@ -1,5 +1,3 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
--- a/Show More
+++ b/Show More
`@ -1,4 +1,2 @@`
	`/* $Id$ */`

	`print(" Required this file");`	`print(" Required this file");`