Jonathan G Rennison
e95216b59d
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
2021-02-19 15:38:34 +00:00
..
2021-02-13 20:09:14 +01:00
2021-02-19 15:38:34 +00:00
2021-02-19 15:38:34 +00:00
2021-02-13 20:09:14 +01:00
2020-06-05 19:36:05 +02:00
2021-02-13 20:09:14 +01:00
2020-06-05 19:36:05 +02:00
2021-02-19 15:38:34 +00:00
2019-11-10 17:59:20 +00:00