Merge branch 'v0.10' into v1.x

Conflicts:
	config-unix.mk
This commit is contained in:
Bert Belder 2014-12-19 17:03:53 +01:00
commit c1025117ea

View File

@ -802,9 +802,9 @@ void fs__scandir(uv_fs_t* req) {
if (len == 0) {
fmt = L"./*";
} else if (pathw[len - 1] == L'/' || pathw[len - 1] == L'\\') {
fmt = L"%s*";
fmt = L"%ls*";
} else {
fmt = L"%s\\*";
fmt = L"%ls\\*";
}
/* Figure out whether path is a file or a directory. */