Jonathan G Rennison
7ff252c58d
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
2019-03-04 01:18:25 +00:00
..
2019-01-11 13:41:12 +01:00
2019-02-22 22:38:26 +00:00
2019-03-04 01:18:25 +00:00
2019-03-04 01:18:25 +00:00
2019-01-10 22:14:23 +00:00
2018-11-28 02:53:51 +00:00
2018-06-05 22:58:35 +02:00
2019-01-26 14:56:35 +01:00
