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
..
2010-08-14 14:50:06 +00:00
2013-07-13 09:59:09 +00:00
2014-09-07 14:21:16 +00:00
2010-11-20 12:11:11 +00:00
2010-11-20 12:11:11 +00:00
2006-03-29 16:30:26 +00:00
2019-01-11 13:41:12 +01:00
2019-05-28 00:43:58 +01:00
2010-08-27 10:42:48 +00:00
2019-07-11 19:45:56 +01:00
2019-07-11 19:45:56 +01:00
2013-06-09 12:52:50 +00:00
2019-01-10 22:14:23 +00:00
2019-04-01 03:16:04 +01:00
2011-10-04 21:35:47 +00:00
2018-06-05 22:58:35 +02:00
2009-10-22 16:01:28 +00:00
2014-12-24 16:53:04 +00:00
2010-11-20 12:11:11 +00:00
2007-06-24 20:41:24 +00:00
2019-01-26 14:56:35 +01:00
2010-11-20 12:11:11 +00:00
