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

2019-07-08 16:19:07 +01:00

..

npf

Merge branch 'master' into jgrpp

2019-07-08 16:19:07 +01:00

yapf

Merge branch 'master' into jgrpp

2019-07-08 16:19:07 +01:00

follow_track.hpp

Fix per-railtype 90 deg turn setting with dual rail type tiles

2019-05-26 11:35:18 +01:00

pathfinder_func.h

(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

2010-01-15 16:41:15 +00:00

pathfinder_type.h

Increase YAPF road vehicle path cache to 16 segments

2019-05-26 11:35:18 +01:00

pf_performance_timer.hpp

Merge: Codechange: Use null pointer literal instead of the NULL macro

2019-04-11 18:14:13 +01:00