Merge branch 'master' into jsTypingForAcquireDts

This commit is contained in:
Jason Ramsay
2016-02-22 19:01:09 -08:00
30 changed files with 640 additions and 49 deletions

View File

@@ -2838,7 +2838,7 @@ namespace ts {
if (oldSourceFile) {
// We already had a source file for this file name. Go to the registry to
// ensure that we get the right up to date version of it. We need this to
// address the following 'race'. Specifically, say we have the following:
// address the following race-condition. Specifically, say we have the following:
//
// LS1
// \