Merge branch 'tracerestrict-sx' into jgrpp

Browse Source

# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp

...

This commit is contained in:

Jonathan G Rennison

2016-09-07 22:06:06 +01:00

parent 88156ee570 162e495cc9

commit 153a0536df

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

Diff Content Not Available