Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization

Conflicts:
	NEWS
develop
expwnent 2014-07-07 09:02:49 -04:00
commit 1ce38f3e3a
1 changed files with 1 additions and 0 deletions

@ -1,6 +1,7 @@
DFHack future
Internals:
supported per save script folders
Items module: added createItem function
Sorted CMakeList for plugins and plugins/devel
diggingInvaders no longer builds if plugin building is disabled