You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/os
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
..
macosx Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 6 years ago
os2 (svn r27643) -Codechange: FiosGetDrives function also takes a destination file list. 8 years ago
unix Merge branch 'master' into jgrpp 6 years ago
windows Merge branch 'master' into jgrpp 6 years ago