Merge branch 'tracerestrict-sx' into jgrpp

Browse Source

Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h

...

This commit is contained in:

Jonathan G Rennison

2015-08-20 00:39:26 +01:00

parent 01c938e1e9 6643d0a661

commit f2d0c3a441

5 changed files with 47 additions and 8 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

BIN

bin/data/tracerestrict.grf Normal file

Binary file not shown.