Merge remote-tracking branch 'dfhack/master' into 0.40.08-r2

Conflicts: plugins/isoworld
2014-08-15 10:55:07 -04:00 · 2014-08-15 10:55:07 -04:00 · 74eee84538
parent 5858b163f3 13bffed647
commit 74eee84538
1 changed files with 1 additions and 1 deletions
--- a/plugins/isoworld
+++ b/plugins/isoworld
@ -1 +1 @@
-Subproject commit 29fad1ef8e7e2aceb2e68c93a3993933168fe885
+Subproject commit 07750ad7f7ce7c2506e5198ffb80ca50a73e9c4e
		`@ -1 +1 @@`
			`Subproject commit 29fad1ef8e7e2aceb2e68c93a3993933168fe885`				`Subproject commit 07750ad7f7ce7c2506e5198ffb80ca50a73e9c4e`