Mohamed Hegazy
|
f90253f73e
|
Merge branch 'master' into exportEquals
Conflicts:
src/compiler/checker.ts
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/emitter.ts
tests/baselines/reference/es6ImportDefaultBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
|
2015-03-23 11:06:44 -07:00 |
|