Merge remote-tracking branch 'origin/develop' into global-onload

2014-09-14 11:55:17 -04:00 · 2014-09-14 11:55:17 -04:00 · 328b95c1ec
parent 34d4537a11 c4d6c384ae
commit 328b95c1ec
2 changed files with 6 additions and 3 deletions
--- a/7
+++ b/7
@ -1,9 +1,12 @@
 DFHack future
+    Internals:
+        - support for global onLoadWorld.init and onUnloadWorld.init files,
+          called when loading and unloading a world
+
+DFHack 0.40.11-r1

    Internals:
        - Plugins on OS X now use ".plug.dylib" as an extension instead of ".plug.so"
-	- support for global onLoadWorld.init and onUnloadWorld.init files,
-          called when loading and unloading a world
    Fixes:
        - hack-wish should work now

--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 1d09acb4f745f6b9b7ed02d427dbdf3d0b75f0cb
+Subproject commit b0355ddc16308132775a7f9038e4384d87947800