Merge branch 'master' into iFeelPrettyErr

Conflicts:
	src/compiler/commandLineParser.ts
This commit is contained in:
Daniel Rosenwasser
2015-10-06 12:54:01 -07:00
484 changed files with 2723 additions and 2818 deletions

View File

@@ -459,6 +459,9 @@ namespace ts {
}
if (opt.isFilePath) {
value = normalizePath(combinePaths(basePath, value));
if (value === "") {
value = ".";
}
}
options[opt.name] = value;
}