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 |
|
Vladimir Matveev
|
e4f6f167f6
|
merge with master, accepted baselines
|
2015-03-17 17:05:30 -07:00 |
|
Mohamed Hegazy
|
b52d9ec23e
|
Report error if module gen target is specified in es6
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
src/compiler/program.ts
tests/baselines/reference/constDeclarations-access5.errors.txt
tests/baselines/reference/es6ExportAssignment.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
tests/cases/compiler/es6ImportDefaultBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
tests/cases/compiler/es6ImportNameSpaceImport.ts
tests/cases/compiler/es6ImportNamedImport.ts
tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
tests/cases/compiler/es6ImportWithoutFromClause.ts
tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts
|
2015-03-11 22:53:36 -07:00 |
|
Sheetal Nandi
|
05fcdf0e30
|
Declaration for default bindings of the import syntax
|
2015-02-10 15:39:24 -08:00 |
|
Sheetal Nandi
|
69fef6e544
|
Parsing for default binding import syntax
|
2015-01-27 16:43:46 -08:00 |
|