Mohamed Hegazy
|
4db61d84be
|
Accept baselines
|
2015-04-28 17:13:47 -07:00 |
|
Anders Hejlsberg
|
4c5aeaf0c9
|
Merge branch 'master' into namespaces
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
src/compiler/program.ts
tests/baselines/reference/constDeclarations-access5.errors.txt
tests/baselines/reference/es6-amd.errors.txt
tests/baselines/reference/es6-declaration-amd.errors.txt
tests/baselines/reference/es6-sourcemap-amd.errors.txt
tests/baselines/reference/es6-umd.errors.txt
tests/baselines/reference/es6-umd2.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
tests/baselines/reference/es6ImportNamedImport.errors.txt
tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt
|
2015-04-28 16:49:23 -07:00 |
|
|
Anders Hejlsberg
|
330d63a173
|
Accepting new baselines
|
2015-04-26 18:31:47 -07:00 |
|
Vladimir Matveev
|
b1cc06e44c
|
merge with master
|
2015-04-23 20:50:35 -07:00 |
|
|
Mohamed Hegazy
|
ded0e398b4
|
update error messages
|
2015-04-23 10:53:19 -07:00 |
|
|
Vladimir Matveev
|
e622c8ec34
|
added tests
|
2015-04-11 08:50:11 -07:00 |
|
|
Mohamed Hegazy
|
cb012e01fd
|
Merge branch 'master' into es6ImportExportEmit
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
|
2015-03-16 20:47:08 -07:00 |
|
|
Mohamed Hegazy
|
090148fdee
|
Merge branch 'master' into es6ImportExportEmit
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
|
2015-03-16 12:11:43 -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 |
|