Merge branch 'master' into infrastructure_sharing

Browse Source

Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp

...

This commit is contained in:

Jonathan G Rennison

2015-08-06 22:55:09 +01:00

parent ee791055f9 163c30570b

commit a4ad4130a6

1106 changed files with 149811 additions and 81548 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

812

src/settings.cpp

File diff suppressed because it is too large Load Diff