Anders Hejlsberg a13b64246a Merge branch 'master' into intersectionTypes ...

Conflicts:
	tests/baselines/reference/APISample_linter.js

2015-06-30 11:57:49 -07:00

..

compiler

Merge branch 'master' into intersectionTypes

2015-06-30 11:57:49 -07:00

harness

Merge pull request #3564 from RyanCavanaugh/jsxAndAs

2015-06-29 10:54:28 -07:00

lib

Merge pull request #3547 from Microsoft/updateMapDeclaration

2015-06-23 17:38:49 -07:00

server

Merge pull request #3542 from weswigham/jake-lssl

2015-06-17 23:54:04 -07:00

services

Merge branch 'master' into intersectionTypes

2015-06-30 11:57:49 -07:00