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-01-22 10:26:45 +01:00
2020-06-27 18:21:17 +02:00
2021-04-24 13:19:13 +02:00
2019-10-20 17:41:17 +01:00
2019-11-13 20:40:18 +01:00
2019-10-20 17:12:54 +01:00
2019-11-13 20:40:18 +01:00
2010-11-20 12:11:11 +00:00
2010-11-20 12:11:11 +00:00
2006-03-29 16:30:26 +00:00
2021-07-20 19:57:23 +02:00
2021-03-02 19:48:50 +00:00
2010-08-27 10:42:48 +00:00
2021-08-29 02:11:58 +01:00
2021-08-29 02:11:58 +01:00
2019-10-20 17:12:54 +01:00
2020-01-26 13:45:51 +01:00
2021-07-11 23:11:05 +02:00
2021-09-04 11:39:54 +01:00
2021-09-04 11:39:54 +01:00
2011-10-04 21:35:47 +00:00
2018-06-05 22:58:35 +02:00
2009-10-22 16:01:28 +00:00
2014-12-24 16:53:04 +00:00
2010-11-20 12:11:11 +00:00
2020-10-29 17:47:05 +00:00
2010-11-20 12:11:11 +00:00