Jonathan G Rennison 0310fb0cdc Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp

2023-01-05 23:45:34 +00:00

13 KiB

Raw Blame History

View Raw