Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source

town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h

...

This commit is contained in:

Jonathan G Rennison

2015-08-05 21:54:11 +01:00

parent 20e2f363f1 44d3c84a11

commit 7ed93f9211

110 changed files with 3527 additions and 336 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

964

src/viewport.cpp

File diff suppressed because it is too large Load Diff