Merge branch 'master' into iFeelPrettyErr

Conflicts:
	src/compiler/commandLineParser.ts
This commit is contained in:
Daniel Rosenwasser committed 2015-10-06 12:54:01 -07:00
commit 87554cbc0c
484 files changed
+2723 -2818

No files matched your search

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