Merge branch 'master' into tvandijck-patch-1

This commit is contained in:
J. Perkins 2017-12-06 13:07:48 -05:00 committed by GitHub
commit d6c7a49dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -190,6 +190,7 @@
m.outDir, m.outDir,
m.intDir, m.intDir,
m.extensionsToDeleteOnClean, m.extensionsToDeleteOnClean,
m.executablePath,
} }
else else
return { return {

View File

@ -133,8 +133,7 @@
context.basedir(fsub, prj.location) context.basedir(fsub, prj.location)
setmetatable(fsub, fileconfig.fsub_mt) return setmetatable(fsub, fileconfig.fsub_mt)
end end