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-11-09 01:55:23 +00:00
2023-02-11 23:05:22 +00:00
2023-07-20 16:34:59 +01:00
2023-07-01 02:42:51 +01:00
2023-03-27 20:14:49 +01:00
2023-09-17 13:10:21 +01:00
2023-04-07 19:33:07 +02:00
2023-07-20 16:34:59 +01:00
2023-09-12 20:06:47 +01:00
2023-07-01 02:42:51 +01:00
2023-11-09 01:55:23 +00:00
2023-08-14 18:51:58 +01:00
2023-07-20 16:34:59 +01:00
2023-05-20 16:50:03 +02:00
2023-06-04 11:15:35 +02:00
2021-05-14 18:15:00 +01:00
2023-05-08 16:49:23 +02:00
2023-07-02 12:02:36 +01:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00