Commit graph

2 commits

Author SHA1 Message Date
Cyrus Najmabadi 6a08c54f42 Merge branch 'master' into sourceFileUpdate
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/harness/fourslash.ts
2014-12-17 13:22:04 -08:00
Anders Hejlsberg 3e436c5047 Adding new tests 2014-12-12 14:34:12 -08:00