Jonathan G Rennison ba8ed880c1 Merge branch 'master' into jgrpp-nrt ... Merge NRT feature # Conflicts: # docs/landscape.html # docs/landscape_grid.html # src/bridge_map.h # src/build_vehicle_gui.cpp # src/company_base.h # src/company_cmd.cpp # src/misc_gui.cpp # src/newgrf.cpp # src/newgrf_engine.cpp # src/pathfinder/follow_track.hpp # src/pathfinder/npf/npf.cpp # src/road_cmd.cpp # src/road_func.h # src/road_gui.cpp # src/road_map.h # src/road_type.h # src/roadveh_cmd.cpp # src/saveload/afterload.cpp # src/saveload/company_sl.cpp # src/script/api/script_bridge.cpp # src/table/newgrf_debug_data.h # src/tile_cmd.h # src/town_cmd.cpp # src/tunnel_map.h # src/tunnelbridge_cmd.cpp		2019-07-11 19:45:56 +01:00
..
ai	Fix: Industry coverage area is no longer rectangular. (#7464)	2019-04-13 14:27:57 +01:00
baseset	Feature: Add NotRoadTypes (NRT)	2019-05-01 21:36:27 +02:00
data
game	Change: Heading for 1.10 now (#7319)	2019-03-03 20:51:57 +01:00
scripts