From: John Resig Date: Tue, 18 Jan 2011 23:11:54 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/mathiasbynens/jquery into mathiasbynens... X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=fc7bd61200a447b361b7d561cf376c29c165aed7;hp=-c Merge branch 'master' of https://github.com/mathiasbynens/jquery into mathiasbynens-master --- fc7bd61200a447b361b7d561cf376c29c165aed7 diff --combined build/uglify.js index 943ddd8,cba0586..cba0586 mode 100644,100755..100644 --- a/build/uglify.js +++ b/build/uglify.js @@@ -143,7 -143,7 +143,7 @@@ function show_copyright(comments) if (c.type == "comment1") { ret += "//" + c.value + "\n"; } else { - ret += "/*" + c.value + "*/"; + ret += "/*" + c.value + "*/\n"; } } return ret; @@@ -181,7 -181,7 +181,7 @@@ function squeeze_it(code) }); if (options.ast) return sys.inspect(ast, null, null); - result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) }); + result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) }) + ";"; return result; } catch(ex) { sys.debug(ex.stack);