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
..
2018-11-01 18:06:08 +01:00
2019-01-31 23:08:03 +00:00
2018-04-22 15:42:29 +02:00
2018-04-22 15:42:29 +02:00
2019-03-03 09:15:39 +01:00
2019-05-01 21:36:27 +02:00
2018-04-28 17:37:59 +02:00
2019-01-05 22:10:37 +01:00
2019-05-01 21:36:27 +02:00
2019-05-01 21:36:27 +02:00
2019-05-01 21:36:27 +02:00
2018-11-05 12:53:36 +00:00
2019-03-24 15:28:48 +00:00
2018-04-24 19:19:00 +02:00
2019-07-11 19:45:56 +01:00