Jonathan G Rennison
4042480806
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
2021-10-08 18:12:04 +01:00
..
2021-09-27 22:47:23 +01:00
2020-06-05 19:36:05 +02:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-05-16 10:07:51 +02:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-22 21:50:02 +01:00
2021-05-13 11:46:51 +02:00
2019-11-10 17:59:20 +00:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-22 21:50:02 +01:00
2021-05-06 20:33:26 +02:00
2021-10-08 18:12:04 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-09-27 22:47:23 +01:00
2021-05-05 23:21:14 +02:00
2021-09-27 22:47:23 +01:00
2019-11-12 18:43:10 +00:00