Jonathan G Rennison 7f10d83a4a Merge branch 'template_train_replacement' into jgrpp ...

# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h

2016-11-01 23:00:48 +00:00

..

macosx

(svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs.

2016-10-31 19:29:01 +00:00

os2

(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.

2016-09-04 12:54:30 +00:00

unix

Merge branch 'save_ext' into jgrpp

2016-09-07 22:02:57 +01:00

windows

Merge branch 'template_train_replacement' into jgrpp

2016-11-01 23:00:48 +00:00