Jonathan G Rennison fd605e3cf3 Merge branch 'master' into jgrpp-beta ... # Conflicts: # .github/workflows/commit-checker.yml # src/company_cmd.cpp # src/console_cmds.cpp # src/crashlog.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/swedish.txt # src/linkgraph/linkgraphjob.cpp # src/linkgraph/mcf.cpp # src/network/core/tcp.cpp # src/network/core/tcp.h # src/network/core/tcp_game.h # src/network/core/udp.h # src/network/network.cpp # src/network/network_admin.cpp # src/network/network_admin.h # src/network/network_chat_gui.cpp # src/network/network_client.cpp # src/network/network_client.h # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/newgrf.cpp # src/newgrf_station.cpp # src/order_gui.cpp # src/rail_cmd.cpp # src/saveload/saveload.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/station_cmd.cpp # src/stdafx.h # src/table/currency_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble # src/table/settings.ini # src/terraform_cmd.cpp # src/timetable_gui.cpp # src/train_cmd.cpp # src/tree_cmd.cpp # src/water_cmd.cpp		2021-09-27 22:47:23 +01:00
..
ci-build.yml	Merge branch 'master' into jgrpp-beta	2021-09-27 22:47:23 +01:00
preview_build.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
preview_label.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
preview_push.yml	Add: [Actions] preview workflow, where PRs can be reviewed in the browser	2020-12-15 15:46:39 +01:00
release.yml	Merge branch 'master' into jgrpp-beta	2021-09-27 22:47:23 +01:00