Merge branch 'master' into jgrpp

src/network/core/tcp_game.h

@@ -175,7 +175,7 @@ protected:
 
 	/**
 	 * Try to join the server:
-	 * string  OpenTTD revision (norev000 if no revision).
+	 * string  OpenTTD revision (norev0000 if no revision).
 	 * string  Name of the client (max NETWORK_NAME_LENGTH).
 	 * uint8_t ID of the company to play as (1..MAX_COMPANIES).
 	 * uint8_t ID of the clients Language.

src/rev.cpp.in

@@ -28,7 +28,7 @@ bool IsReleasedVersion()
  * - "<tag>", like "<major>.<minor>.<build>[-RC<rc>]",
  * - "<commitdate>-g<shorthash><modified>" in "master",
  * - "<commitdate>-<branch>-g<shorthash><modified>" in other branches, or
- * - "norev000", if the version is unknown.
+ * - "norev0000", if the version is unknown.
  *
  * The major, minor and build are the numbers that describe releases of
  * OpenTTD (like 0.5.3). "-RC" is used to flag release candidates.