Changeset

7159:f11d6c9d1c1f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Feb 2016 13:24:21 +0000
parents 7157:0890a428a99b (current diff) 7158:e5412e685991 (diff)
children 7161:8380b595a33b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/core/loggingmanager.lua	Wed Feb 10 07:57:58 2016 +0100
+++ b/core/loggingmanager.lua	Thu Feb 18 13:24:21 2016 +0000
@@ -16,7 +16,7 @@
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 local tostring = tostring;
-local unpack = table.unpack or unpack;
+local select, unpack = select, table.unpack or unpack;
 
 local config = require "core.configmanager";
 local logger = require "util.logger";