Jonathan G Rennison 3d4261a33a Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini

2021-11-08 00:44:18 +00:00

..

CMakeLists.txt

Merge branch 'master' into jgrpp-beta

2021-11-01 21:18:24 +00:00

company_settings.ini

…

currency_settings.ini

…

gameopt_settings.ini

Merge branch 'master' into jgrpp-beta

2021-11-03 00:45:12 +00:00

misc_settings.ini

…

network_private_settings.ini

Merge branch 'master' into jgrpp-beta

2021-11-01 21:18:24 +00:00

network_secrets_settings.ini

Merge branch 'master' into jgrpp-beta

2021-11-02 00:51:54 +00:00

network_settings.ini

Merge tag '12.0-beta1' into jgrpp-beta

2021-11-02 17:51:38 +00:00

settings.ini

Merge branch 'master' into jgrpp

2021-11-08 00:44:18 +00:00

win32_settings.ini

…

window_settings.ini

…