Anders Hejlsberg 7c241ba2f7 Merge branch 'conditionalTypes' into inferTypes ...

# Conflicts:
#	src/compiler/checker.ts
#	tests/cases/fourslash/completionInJSDocFunctionNew.ts
#	tests/cases/fourslash/completionInJSDocFunctionThis.ts

2018-01-30 13:40:16 -08:00

..

compiler

Unused type parameters should be checked by --noUnusedParameters, not (#21167)

2018-01-25 16:18:35 -08:00

conformance

Merge branch 'conditionalTypes' into inferTypes

2018-01-30 13:40:16 -08:00

fourslash

Merge branch 'conditionalTypes' into inferTypes

2018-01-30 13:40:16 -08:00

project

…

projects

…

test262-harness

…

unittests

…

user

External test runner updates (#21276)

2018-01-18 13:48:23 -08:00