Merge branch 'master' into jgrpp

2018-01-14 23:22:47 +00:00
parent 3dbf09888a 0842742b91
commit 4a0d949d83
41 changed files with 306 additions and 261 deletions
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -19,7 +19,7 @@
 *
 * 1.8.0 is not yet released. The following changes are not set in stone yet.
 *
- * \b 1.7.0
+ * \b 1.7.0 - 1.7.2
 *
 * No changes
 *
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -19,7 +19,7 @@
 *
 * 1.8.0 is not yet released. The following changes are not set in stone yet.
 *
- * \b 1.7.0
+ * \b 1.7.0 - 1.7.2
 *
 * No changes
 *