Merge branch 'master' into save_ext

# Conflicts: # src/saveload/saveload.cpp # src/saveload/saveload.h
2019-01-21 18:37:47 +00:00
parent 4a162c5502 9ce92521c1
commit 80d6f6c622
113 changed files with 1599 additions and 1012 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -310,7 +310,7 @@ static void ParseResolution(Dimension *res, const char *s)


 /**
- * Unitializes drivers, frees allocated memory, cleans pools, ...
+ * Uninitializes drivers, frees allocated memory, cleans pools, ...
 * Generally, prepares the game for shutting down
 */
 static void ShutdownGame()