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-01 17:07:34 +00:00
2020-09-25 14:43:13 +01:00
2021-02-19 15:38:34 +00: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
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-02-19 15:38:34 +00:00
2020-10-03 16:17:11 +01:00
2021-01-03 13:25:32 +01:00
2021-02-05 12:31:27 +01:00
2020-12-19 18:26:29 +01:00
2021-01-29 18:27:36 +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