Merge branch 'cpp-11' into save_ext

Browse Source

# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h

...

This commit is contained in:

Jonathan G Rennison

2019-02-04 18:24:38 +00:00

parent 02e2627765 09c62d6951

commit 46b5b0155c

280 changed files with 11624 additions and 3855 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

368

src/table/settings.ini

File diff suppressed because it is too large Load Diff