Anders Hejlsberg 82448af476 Merge branch 'master' into restTuples ...

# Conflicts:
#	Jakefile.js
#	scripts/produceLKG.ts
#	tests/baselines/reference/api/tsserverlibrary.d.ts
#	tests/baselines/reference/api/typescript.d.ts

2018-06-16 08:02:36 -07:00

..

cancellationToken

Tests passing and lib loading

2018-06-10 20:05:12 -07:00

compiler

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

harness

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

jsTyping

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

lib

Merge remote-tracking branch 'origin/master' into updateDom

2018-06-04 17:01:34 -07:00

loc/lcl

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

server

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

services

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

testRunner

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

tsc

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

tsserver

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

typingsInstaller

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

typingsInstallerCore

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

watchGuard

Attempt to rewrite the jakefile and fail

2018-06-10 10:58:16 -07:00

tsconfig-base.json

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00

tsconfig.json

Merge branch 'master' into restTuples

2018-06-16 07:47:30 -07:00