Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp ... # Conflicts: # src/console_cmds.cpp # src/gfx_func.h # src/industry.h # src/lang/czech.txt # src/lang/estonian.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/slovak.txt # src/saveload/saveload.h # src/station_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/waypoint_gui.cpp		2021-02-01 18:58:36 +00:00
..
baseset	Merge tag '1.11.0-beta1' into jgrpp	2021-02-01 18:58:36 +00:00
openttd.16.png
openttd.32.bmp
openttd.32.png
openttd.32.xpm
openttd.48.png
openttd.64.png
openttd.64.xpm
openttd.128.png
openttd.256.png
openttd.desktop.filter.awk	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
openttd.desktop.in	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
openttd.desktop.translation.awk	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
openttd.svg