Jonathan G Rennison
3436e0a781
Merge branch 'master' into jgrpp
# Conflicts:
# src/error.h
# src/error_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/misc_gui.cpp
# src/newgrf_gui.cpp
# src/news_gui.cpp
# src/rail_cmd.cpp
# src/saveload/gamelog_sl.cpp
# src/script/api/script_text.cpp
# src/script/script_instance.cpp
# src/statusbar_gui.cpp
# src/strings.cpp
# src/strings_func.h
# src/strings_internal.h
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/textbuf_gui.h
2023-11-09 01:55:23 +00:00
..
2023-03-26 09:35:44 +02:00
2021-11-01 18:54:43 +00:00
2023-11-09 01:55:23 +00:00
2021-08-15 14:14:13 +02:00
2019-08-31 21:20:24 +02:00
2023-07-19 11:43:24 +02:00
2023-04-17 17:59:16 +02:00
2023-03-08 22:33:47 +01:00
2023-07-14 14:32:46 +02:00