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
..
2021-01-22 10:26:45 +01:00
2020-06-27 18:21:17 +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
2020-12-10 19:37:54 +00:00
2010-08-27 10:42:48 +00:00
2020-10-28 00:27:48 +00:00
2020-12-07 17:56:44 +00:00
2019-10-20 17:12:54 +01:00
2020-01-26 13:45:51 +01:00
2019-10-20 17:12:54 +01:00
2020-10-19 19:45:08 +01:00
2020-10-19 19:45:08 +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