Jonathan G Rennison
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
2021-11-02 17:51:38 +00:00
..
2021-11-02 17:51:38 +00:00
2020-09-25 14:43:13 +01:00
2021-09-27 22:47:23 +01:00
2021-04-24 21:16:06 +02:00
2021-02-22 23:17:45 +01:00
2020-09-25 14:43:13 +01:00
2021-02-07 12:54:02 +01:00
2020-06-30 22:30:29 +01:00
2020-06-28 21:57:02 +01:00
2020-07-01 00:25:50 +01:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2020-06-05 19:36:05 +02:00
2020-06-30 09:43:00 +01:00
2021-02-07 16:21:13 +01:00
2020-09-25 14:43:13 +01:00
2020-06-28 21:57:02 +01:00
2021-02-08 23:23:24 +00:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00
2020-09-25 14:43:13 +01:00
2020-06-28 21:57:02 +01:00
2020-11-26 19:06:03 +00:00
2021-03-01 18:08:28 +00:00
2021-09-27 22:47:23 +01:00
2021-03-01 23:08:23 +00:00
2021-07-04 16:31:59 +02:00
2021-02-05 12:31:27 +01:00
2020-12-19 18:26:29 +01:00
2021-03-13 12:00:40 +00:00
2020-06-05 19:36:05 +02:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00