Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/mathiasbynens/jquery into…

… mathiasbynens-master
  • Loading branch information
jeresig committed Jan 18, 2011
2 parents 40f48ef + c5ec1cb commit fc7bd61200a447b361b7d561cf376c29c165aed7
Showing with 2 additions and 2 deletions.
  1. +2 −2 build/uglify.js
@@ -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 @@ 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);

0 comments on commit fc7bd61

Please sign in to comment.
You can’t perform that action at this time.