Merge remote-tracking branch 'upstream/master'

2014-03-19 22:01:51 +02:00
parent d8832c2ad6 f44d54a9e4
commit 121a8ad773
40 changed files with 260 additions and 126 deletions
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -15,6 +15,10 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
+ * \b 1.5.0
+ *
+ * 1.5.0 is not yet released. The following changes are not set in stone yet.
+ *
 * \b 1.4.0
 *
 * 1.4.0 is not yet released. The following changes are not set in stone yet.
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -15,6 +15,10 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
+ * \b 1.5.0
+ *
+ * 1.5.0 is not yet released. The following changes are not set in stone yet.
+ *
 * \b 1.4.0
 *
 * 1.4.0 is not yet released. The following changes are not set in stone yet.