Merge branch 'master' into harmony

This commit is contained in:
Richard van Velzen
2015-10-28 20:38:07 +01:00
2 changed files with 1 additions and 2 deletions

View File

@@ -1,7 +1,6 @@
language: node_js language: node_js
before_install: "npm install -g npm" before_install: "npm install -g npm"
node_js: node_js:
- "iojs"
- "0.12" - "0.12"
- "0.10" - "0.10"
- "4" - "4"

View File

@@ -95,7 +95,7 @@ function OutputStream(options) {
case "\f": return "\\f"; case "\f": return "\\f";
case "\n": return "\\n"; case "\n": return "\\n";
case "\r": return "\\r"; case "\r": return "\\r";
case "\v": return "\\v"; case "\x0B": return output.option("screw_ie8") ? "\\v" : "\\x0B";
case "\u2028": return "\\u2028"; case "\u2028": return "\\u2028";
case "\u2029": return "\\u2029"; case "\u2029": return "\\u2029";
case '"': ++dq; return '"'; case '"': ++dq; return '"';