Merge branch 'tracerestrict-sx' into jgrpp

Browse Source

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

pull/8/head

Jonathan G Rennison 8 years ago

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available