Anders Hejlsberg 87d43aa6f5 Merge branch 'master' into circularInstantiatedTypes ...

Conflicts:
	src/compiler/checker.ts
	src/compiler/types.ts

2015-06-03 14:13:16 -07:00

..

compiler

Merge branch 'master' into circularInstantiatedTypes

2015-06-03 14:13:16 -07:00

harness

Merge pull request #3307 from zhengbli/ms_master

2015-06-02 16:31:39 -07:00

lib

Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators

2015-05-29 17:14:29 -07:00

server

CR feedback

2015-06-02 15:25:01 -07:00

services

Merge pull request #3296 from Microsoft/jsDocClassification

2015-06-02 15:17:39 -07:00