Commit graph

8 commits

Author SHA1 Message Date
Anders Hejlsberg 330d63a173 Accepting new baselines 2015-04-26 18:31:47 -07:00
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
Anders Hejlsberg f3fb85fa46 Accepting new baselines 2015-03-21 13:18:11 -07:00
Mohamed Hegazy 96e5286003 Merge branch 'master' into es6ImportDts
Conflicts:
	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-02-24 15:53:38 -08:00
Anders Hejlsberg f0f4ca6b06 Merge branch 'master' into es6Import
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/emitter.ts
	tests/baselines/reference/APISample_compile.js
	tests/baselines/reference/APISample_compile.types
	tests/baselines/reference/APISample_linter.js
	tests/baselines/reference/APISample_linter.types
	tests/baselines/reference/APISample_transform.js
	tests/baselines/reference/APISample_transform.types
	tests/baselines/reference/APISample_watcher.js
	tests/baselines/reference/APISample_watcher.types
	tests/baselines/reference/recursiveClassReferenceTest.js.map
	tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
2015-02-23 11:15:56 -08:00
Sheetal Nandi 05fcdf0e30 Declaration for default bindings of the import syntax 2015-02-10 15:39:24 -08:00
Anders Hejlsberg 67874b4c9e Accepting new baselines 2015-02-09 11:23:32 -08:00
Anders Hejlsberg acaea1c914 Accepting new baselines 2015-02-08 08:13:15 -08:00