Merge branch 'master' into town_cargo_adj

Browse Source

Conflicts:
	src/settings_gui.cpp

...

This commit is contained in:

Jonathan G Rennison

2015-08-02 00:04:04 +01:00

parent 1c9801e6b6 67366cf03d

commit 60377f2262

940 changed files with 57198 additions and 38591 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

1683

src/settings_gui.cpp

File diff suppressed because it is too large Load Diff