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 |
|