Commit graph

7 commits

Author SHA1 Message Date
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
Vladimir Matveev e4f6f167f6 merge with master, accepted baselines 2015-03-17 17:05:30 -07:00