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/pathfinder
Jonathan G Rennison ffef1c9e44 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
3 years ago
..
npf Merge branch 'master' into jgrpp-beta 3 years ago
yapf Merge branch 'jgrpp' into jgrpp-beta 3 years ago
CMakeLists.txt Remove: performance measurements in YAPF 3 years ago
follow_track.hpp Remove: performance measurements in YAPF 3 years ago
pathfinder_func.h Fix #8123: trams on half-tiles couldn't find depots (#8738) 3 years ago
pathfinder_type.h Merge branch 'master' into jgrpp 4 years ago