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 36eb4165b8 Merge branch 'master' into jgrpp ... # Conflicts: # src/bridge_map.h # src/crashlog.cpp # src/industry.h # src/linkgraph/linkgraph_type.h # src/order_type.h # src/saveload/afterload.cpp # src/settings.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/spritecache.cpp # src/stdafx.h # src/table/settings.h.preamble # src/train.h # src/vehicle.cpp # src/viewport.cpp # src/viewport_func.h # src/widgets/station_widget.h # src/zoom_func.h # src/zoom_type.h		5 years ago
..
npf	Merge branch 'master' into jgrpp	5 years ago
yapf	Merge branch 'master' into jgrpp	5 years ago
follow_track.hpp	Fix per-railtype 90 deg turn setting with dual rail type tiles	5 years ago
pathfinder_func.h	…
pathfinder_type.h	Increase YAPF road vehicle path cache to 16 segments	5 years ago
pf_performance_timer.hpp	Merge: Codechange: Use null pointer literal instead of the NULL macro	6 years ago