openttd

Files

Jonathan G Rennison 072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp

# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h

2017-02-05 20:43:56 +00:00

npf

Merge branch 'master' into jgrpp

2017-01-17 19:11:09 +00:00

opf

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

yapf

Merge branch 'custom_bridgeheads' into jgrpp

2017-02-05 20:43:56 +00:00

follow_track.hpp

Merge branch 'custom_bridgeheads' into jgrpp