Merge branch 'master' into jgrpp

# Conflicts: # src/town_cmd.cpp
2020-06-05 17:07:58 +01:00
parent 677940cfc6 eeed3a7613
commit 43c538fa7d
10 changed files with 48 additions and 65 deletions
--- a/src/cargopacket.h
+++ b/src/cargopacket.h
@@ -582,8 +582,8 @@ public:
 	}

 	/**
-	 * Are two the two CargoPackets mergeable in the context of
-	 * a list of CargoPackets for a Vehicle?
+	 * Are the two CargoPackets mergeable in the context of
+	 * a list of CargoPackets for a Station?
 	 * @param cp1 First CargoPacket.
 	 * @param cp2 Second CargoPacket.
 	 * @return True if they are mergeable.