Jonathan G Rennison 671c12999e Merge branch 'template_train_replacement' into template_train_replacement-sx ...

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list

2016-02-14 17:40:39 +00:00

73 KiB

Raw Blame History

View Raw