Commit graph

7 commits

Author SHA1 Message Date
Anders Hejlsberg 6fda0cb561 Accepting new baselines 2015-03-30 02:54:32 -07:00
Anders Hejlsberg 6e169d5bee Merge branch 'master' into exportDefault
Conflicts:
	tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
	tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
2015-03-30 02:45:10 -07:00
Anders Hejlsberg 872beeee95 Accepting new baselines 2015-03-30 02:25:47 -07:00
Cyrus Najmabadi ceeeb9cd11 Always preserve new lines for array and object literals and additional constructs like blocks. 2015-03-26 13:46:35 -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
Vladimir Matveev e4f6f167f6 merge with master, accepted baselines 2015-03-17 17:05:30 -07:00
Mohamed Hegazy b3c8bcb319 Emit export default in ES6 2015-03-12 17:14:33 -07:00