Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2020-06-01 20:39:46 +01:00
27 changed files with 363 additions and 17 deletions

View File

@@ -887,6 +887,7 @@ script/api/script_marine.hpp
script/api/script_news.hpp
script/api/script_object.hpp
script/api/script_order.hpp
script/api/script_priorityqueue.hpp
script/api/script_rail.hpp
script/api/script_railtypelist.hpp
script/api/script_road.hpp
@@ -956,6 +957,7 @@ script/api/script_marine.cpp
script/api/script_news.cpp
script/api/script_object.cpp
script/api/script_order.cpp
script/api/script_priorityqueue.cpp
script/api/script_rail.cpp
script/api/script_railtypelist.cpp
script/api/script_road.cpp