Merge branch 'master' into jgrpp

2015-12-06 17:13:37 +00:00
parent 99cbd64756 ae767d30a4
commit 14bf956cec
9 changed files with 291 additions and 73 deletions
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -19,6 +19,18 @@
 *
 * 1.6.0 is not yet released. The following changes are not set in stone yet.
 *
+ * \b 1.5.3
+ *
+ * No changes
+ *
+ * \b 1.5.2
+ *
+ * No changes
+ *
+ * \b 1.5.1
+ *
+ * No changes
+ *
 * \b 1.5.0
 *
 * API additions:
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -19,6 +19,18 @@
 *
 * 1.6.0 is not yet released. The following changes are not set in stone yet.
 *
+ * \b 1.5.3
+ *
+ * No changes
+ *
+ * \b 1.5.2
+ *
+ * No changes
+ *
+ * \b 1.5.1
+ *
+ * No changes
+ *
 * \b 1.5.0
 *
 * API additions: