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.

Jonathan G Rennison a98a56669b Merge branch 'master' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/autoreplace_cmd.cpp # src/industry_gui.cpp # src/landscape.cpp # src/network/network_content.cpp # src/newgrf_roadstop.cpp # src/pathfinder/yapf/yapf_ship.cpp # src/road_gui.cpp # src/saveload/ai_sl.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/station.cpp # src/station_gui.cpp # src/video/cocoa/cocoa_ogl.h # src/video/sdl2_opengl_v.h # src/video/video_driver.hpp # src/video/win32_v.h # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_type.h # src/window.cpp		4 months ago
..
CMakeLists.txt	Feature: Region-based pathfinder for ships (#10543)	5 months ago
nodelist.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf.h	…
yapf.hpp	…
yapf_base.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_cache.h	…
yapf_common.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_costbase.hpp	…
yapf_costcache.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_costrail.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_destrail.hpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
yapf_node.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_node_rail.hpp	Re-order various structs to reduce holes/padding	5 months ago
yapf_node_road.hpp	…
yapf_node_ship.hpp	…
yapf_rail.cpp	Tracerestrict: Only apply wait at PBS for intermediary signals in forward direction	5 months ago
yapf_road.cpp	Merge branch 'master' into jgrpp	5 months ago
yapf_ship.cpp	Merge branch 'master' into jgrpp	4 months ago
yapf_ship_regions.cpp	Fix #5713: FindClosestShipDepot only considers depots that are actually reachable (#11768)	5 months ago
yapf_ship_regions.h	Feature: Region-based pathfinder for ships (#10543)	5 months ago
yapf_type.hpp	…