Jonathan G Rennison 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp ...

# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp

2019-01-06 22:35:57 +00:00

..

macosx

Merge remote-tracking branch 'origin/master' into jgrpp

2018-12-10 18:40:05 +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 'master' into jgrpp

2018-05-03 23:54:51 +01:00

windows

Merge branch 'more_cond_orders-sx' into jgrpp

2019-01-06 22:35:57 +00:00