Merge branch 'changelog-gen' into develop

2018-04-03 11:39:01 -04:00 · 2018-04-03 11:39:01 -04:00 · 5f08ae339f
parent 953673e45d 490946cc5e
commit 5f08ae339f
4 changed files with 10 additions and 3 deletions
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@ -35,9 +35,16 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ======== making a new DFHack release!                                   ========
 ================================================================================
 # Future
+
+## Fixes
+- `modtools/item-trigger`: fixed token format in help text
+
 ## Misc Improvements
 - Reorganized changelogs and improved changelog editing process
+- `modtools/item-trigger`: added support for multiple type/material/contaminant conditions

+## Structures
+-@ ``renderer``: fixed vtable addresses on 64-bit OS X

 ================================================================================
 # 0.44.09-alpha1
--- a/docs/gen_changelog.py
+++ b/docs/gen_changelog.py
@ -60,7 +60,7 @@ def parse_changelog():
            if multiline:
                multiline += line
            elif '[[[' in line:
-                multiline = line
+                multiline = line.replace('[[[', '')

            if ']]]' in multiline:
                line = multiline.replace(']]]', '')
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 61a240140332b9e3dbafbd8b3f0455c3bdd617a3
+Subproject commit d02e2063c52f685cd4b0d1bc28ba81f0c7b1e70a
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4e3b9aa4e32e0b552c01f9a1e4a6eaa3af0cdb58
+Subproject commit 7d7dd8a7498e975a19231435e7cb225025042a78