Commit graph

4 commits

Author SHA1 Message Date
Mohamed Hegazy fad889283e Merge branch 'master' into exportEqualsMerged
Conflicts:
	src/compiler/checker.ts
	src/compiler/emitter.ts
	src/compiler/types.ts
	tests/baselines/reference/APISample_compile.js
	tests/baselines/reference/APISample_linter.js
	tests/baselines/reference/APISample_transform.js
	tests/baselines/reference/APISample_watcher.js
	tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
	tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
	tests/baselines/reference/es6ExportAllInEs5.js
	tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
2015-03-25 00:06:38 -07:00
Mohamed Hegazy d2ead15767 Accept baseline changes 2015-03-23 12:47:39 -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
Mohamed Hegazy c877b1e0a5 Add tests 2015-03-15 18:24:12 -07:00