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
..
2019-05-23 22:53:17 +01:00
2019-04-11 18:14:13 +01:00
2019-03-27 18:12:04 +00:00
2019-03-20 19:24:55 +01:00
2019-04-11 18:14:13 +01:00
2019-07-08 16:19:07 +01:00
2019-05-23 22:53:17 +01:00
2019-04-11 18:14:13 +01:00
2019-04-13 12:49:18 +01:00
2019-03-24 16:10:04 +01:00
2019-04-18 22:53:44 +01:00
2019-04-10 23:22:20 +02:00
2019-04-11 18:14:13 +01:00
2019-04-10 23:22:20 +02:00
2009-08-21 20:21:05 +00:00
2019-07-08 16:19:07 +01:00
2019-03-20 19:24:55 +01:00
2019-04-11 18:14:13 +01:00
2019-05-27 17:56:41 +01:00
2019-05-23 22:53:17 +01:00
2019-03-27 18:12:04 +00:00
2019-04-11 18:14:13 +01:00
2019-03-20 19:24:55 +01:00
2019-05-20 19:38:47 +01:00
2019-03-20 19:24:55 +01:00