Anders Hejlsberg
|
fc842b177e
|
Merge branch 'master' into unionTypes
Conflicts:
src/compiler/checker.ts
src/compiler/types.ts
src/services/services.ts
tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt
tests/baselines/reference/bestCommonTypeOfTuple.types
tests/baselines/reference/bestCommonTypeOfTuple2.types
tests/baselines/reference/castingTuple.errors.txt
tests/baselines/reference/contextualTypeWithTuple.errors.txt
tests/baselines/reference/genericCallWithTupleType.errors.txt
tests/baselines/reference/indexerWithTuple.types
tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
|
2014-10-13 12:37:34 -07:00 |
|
