Merge 0.12->trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/core/configmanager.lua b/core/configmanager.lua
index a379ecea..4cd7c9d6 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -31,6 +31,7 @@ local parser = nil;
 
 local config_mt = { __index = function (t, _) return rawget(t, "*"); end};
 local config = setmetatable({ ["*"] = { } }, config_mt);
+local files = {};
 
 -- When host not found, use global
 local host_mt = { __index = function(_, k) return config["*"][k] end }
@@ -98,6 +99,10 @@ function _M.load(filename, config_format)
 	end
 end
 
+function _M.files()
+	return files;
+end
+
 -- Built-in Lua parser
 do
 	local pcall = _G.pcall;
@@ -253,6 +258,8 @@ do
 			return nil, err;
 		end
 
+		t_insert(files, config_file);
+
 		return true, warnings;
 	end