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
..
npf	Merge branch 'master' into jgrpp	4 months ago
yapf	Merge branch 'master' into jgrpp	4 months ago
CMakeLists.txt	Feature: Region-based pathfinder for ships (#10543)	5 months ago
follow_track.hpp	Re-order various structs to reduce holes/padding	5 months ago
pathfinder_func.h	Merge branch 'master' into jgrpp	5 months ago
pathfinder_type.h	Cleanup: Remove unused constant YAPF_SHIP_PATH_CACHE_LENGTH	5 months ago
water_regions.cpp	Merge tag '14.0-beta2' into jgrpp	4 months ago
water_regions.h	Merge tag '14.0-beta2' into jgrpp	4 months ago