Merge branch 'newgrf-property-mapping' into jgrpp

# Conflicts: # docs/newgrf-additions.html # src/newgrf.cpp
2018-11-11 11:27:41 +00:00
parent e735c1a51a 9a6a66a054
commit 06c458cb19
8 changed files with 404 additions and 33 deletions
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -23,7 +23,7 @@
 *
 * \b 1.8.0
 *
- * 1.8.0 is not yet released. The following changes are not set in stone yet.
+ * No changes
 *
 * \b 1.7.0 - 1.7.2
 *