Merge branch 'master' into jgrpp-beta

Browse Source

# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.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

...

This commit is contained in:

Jonathan G Rennison

2021-10-18 00:31:37 +01:00

parent 784fcbd1e7 4d74e51907

commit 406b81abb1

21 changed files with 636 additions and 1034 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

578

src/settings.cpp

File diff suppressed because it is too large Load Diff