Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-03-07 16:48:28 +01:00
commit 037707af4c

View file

@ -590,8 +590,11 @@ function commands.about(arg)
module_versions[name] = module._VERSION; module_versions[name] = module._VERSION;
end end
end end
if luaevent then
module_versions["libevent"] = luaevent.core.libevent_version();
end
local sorted_keys = array.collect(keys(module_versions)):sort(); local sorted_keys = array.collect(keys(module_versions)):sort();
for _, name in ipairs(array.collect(keys(module_versions)):sort()) do for _, name in ipairs(sorted_keys) do
print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]); print(name..":"..string.rep(" ", longest_name-#name), module_versions[name]);
end end
print(""); print("");