Commit graph

2 commits

Author SHA1 Message Date
Jason Freeman cf4ca1fc3c Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-05-06 11:42:26 -07:00
Jason Freeman 8c1f5da76a Always call getReturnTypeOfSignature on a generator from checkFunctionLikeDeclaration 2015-05-06 11:28:13 -07:00