Daniel Rosenwasser
|
5fc2ec701b
|
Merge branch 'master' into thanksLua
Conflicts:
src/compiler/emitter.ts
tests/baselines/reference/FunctionPropertyAssignments5_es6.js
tests/baselines/reference/computedPropertyNames9_ES6.js
tests/baselines/reference/computedPropertyNamesDeclarationEmit3.js
tests/baselines/reference/computedPropertyNamesDeclarationEmit4.js
tests/baselines/reference/parserES5ComputedPropertyName3.js
tests/baselines/reference/parserES5ComputedPropertyName4.js
|
2015-02-17 17:43:06 -08:00 |
|