Merge branch 'tracerestrict-sx' into jgrpp

Browse Source

# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h

...

This commit is contained in:

Jonathan G Rennison

2017-04-05 19:00:24 +01:00

parent 65c65c1dcf f50a9fef4f

commit b8328ad21f

24 changed files with 1719 additions and 40 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

898

src/tracerestrict_gui.cpp

File diff suppressed because it is too large Load Diff