Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2015-10-01 16:34:37 +02:00
commit 22a9ed838b

View File

@ -571,6 +571,7 @@ local function dump_trace(what, tr, func, pc, otr, oex)
end end
if dumpmode.H then out:write("</pre>\n\n") else out:write("\n") end if dumpmode.H then out:write("</pre>\n\n") else out:write("\n") end
else else
if what == "flush" then symtab, nexitsym = {}, 0 end
out:write("---- TRACE ", what, "\n\n") out:write("---- TRACE ", what, "\n\n")
end end
out:flush() out:flush()