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/regression
Jonathan G Rennison 16dfb84978 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.h
#	src/console_gui.cpp
#	src/music.cpp
#	src/pathfinder/npf/npf.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_types.hpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/strings.cpp
#	src/table/settings/pathfinding_settings.ini
#	src/train_cmd.cpp
#	src/vehicle_type.h
#	src/waypoint_gui.cpp
1 month ago
..
regression Merge branch 'master' into jgrpp 1 month ago
stationlist Merge tag '14.0-beta3' into jgrpp 7 months ago
CMakeLists.txt Change: [CMake] Use explicit list for regression (#11541) 10 months ago
regression.cfg Merge tag '14.0-beta3' into jgrpp 7 months ago