Merge branch 'master' into code-generator

Conflicts: lib/6to5/transformers/classes.js test/fixtures/transformation/source-maps/class/expected.js test/fixtures/transformation/source-maps/class/source-mappings.json
2014-11-03 13:38:44 +11:00
parent 6d6039aeb6 c17878913b
commit 95f3ca6348
14 changed files with 110 additions and 39 deletions
--- a/test/fixtures/transformation/source-maps/class/source-mappings.json
+++ b/test/fixtures/transformation/source-maps/class/source-mappings.json
@@ -4,7 +4,7 @@
    "column": 11
  },
  "generated": {
-    "line": 5,
+    "line": 9,
    "column": 11
  }
 }]