Daniel Rosenwasser
|
ec678f3ebd
|
Merge branch 'master' into thanksLua
Conflicts:
src/compiler/emitter.ts
tests/baselines/reference/computedPropertyNames12_ES5.errors.txt
tests/baselines/reference/computedPropertyNames14_ES5.errors.txt
tests/baselines/reference/computedPropertyNames15_ES5.errors.txt
tests/baselines/reference/computedPropertyNames17_ES5.errors.txt
tests/baselines/reference/computedPropertyNames32_ES5.errors.txt
tests/baselines/reference/computedPropertyNames35_ES5.errors.txt
tests/baselines/reference/computedPropertyNames3_ES5.errors.txt
tests/baselines/reference/computedPropertyNames42_ES5.errors.txt
tests/baselines/reference/computedPropertyNames5_ES5.errors.txt
tests/baselines/reference/computedPropertyNames6_ES5.errors.txt
tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
tests/baselines/reference/computedPropertyNames9_ES5.errors.txt
tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.errors.txt
tests/baselines/reference/computedPropertyNamesDeclarationEmit4_ES5.errors.txt
tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.errors.txt
|
2015-02-20 16:44:20 -08:00 |
|