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-02-01 18:58:36 +00:00
2010-11-20 12:11:11 +00:00
2006-08-13 08:18:11 +00:00
2010-11-20 12:11:11 +00:00
2005-05-28 10:32:09 +00:00
2010-11-20 12:11:11 +00:00
2010-11-20 12:11:11 +00:00
2005-01-22 23:57:03 +00:00
2010-11-20 12:11:11 +00:00
2010-11-20 12:11:11 +00:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00
2009-12-28 19:26:44 +00:00