Jonathan G Rennison 9e946d4c5d Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/command.cpp # src/console_cmds.cpp # src/group_gui.cpp # src/lang/catalan.txt # src/lang/czech.txt # src/lang/danish.txt # src/lang/greek.txt # src/lang/hungarian.txt # src/lang/irish.txt # src/lang/japanese.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/traditional_chinese.txt # src/lang/turkish.txt # src/lang/ukrainian.txt # src/lang/vietnamese.txt # src/network/network.cpp # src/network/network_client.cpp # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/saveload/afterload.cpp # src/saveload/newgrf_sl.cpp # src/saveload/saveload.h # src/script/script_instance.cpp # src/toolbar_gui.cpp # src/toolbar_gui.h # src/vehicle_gui.cpp # src/widgets/rail_widget.h # src/widgets/vehicle_widget.h # src/window.cpp		2021-11-03 00:45:12 +00:00
..
compat_0.7.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.0.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.1.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.2.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.3.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.4.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.5.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.6.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.7.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.8.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.9.nut	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
compat_1.10.nut	Change: Heading for 1.11 now	2020-02-08 23:38:49 +01:00
compat_1.11.nut	Change: Heading for 1.12 now (#8862)	2021-03-14 20:47:31 +01:00
compat_12.nut	Change: Heading for 13 now (#9573)	2021-09-25 13:48:03 +02:00
compat_13.nut	Change: Heading for 13 now (#9573)	2021-09-25 13:48:03 +02:00