Merge branch 'master' into jgrpp-beta

Browse Source

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble

...

This commit is contained in:

Jonathan G Rennison

2021-10-17 19:31:36 +01:00

parent b00d5e07d2 8372c679e3

commit 784fcbd1e7

14 changed files with 849 additions and 769 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

969

src/settings.cpp

File diff suppressed because it is too large Load Diff