Merge branch 'save_ext' into vehicle_repair_costs-sx

Browse Source

Conflicts:
	src/saveload/saveload.cpp
	src/settings_gui.cpp

...

This commit is contained in:

Jonathan G Rennison

2015-08-04 23:56:05 +01:00

parent 938babfe7b eadeb51535

commit 0a7441e56c

916 changed files with 53204 additions and 37006 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

1685

src/settings_gui.cpp

File diff suppressed because it is too large Load Diff