aboutsummaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/minimatch
diff options
context:
space:
mode:
authorForrest L Norvell <forrest@npmjs.com>2015-02-20 09:03:34 -0800
committerBen Noordhuis <info@bnoordhuis.nl>2015-02-22 07:42:24 +0100
commit1e2fa1537f9978acbd27db6ee151885ab02346c1 (patch)
treeaa886046ac044759ab2c4650d4b45d2b736dbcde /deps/npm/node_modules/minimatch
parent3ab9b92e90e4bb3ed68457fcb95bc32f17586f3a (diff)
downloadandroid-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.gz
android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.bz2
android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.zip
deps: upgrade npm to 2.6.0
PR-URL: https://github.com/iojs/io.js/pull/904 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/minimatch')
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md2
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.bak1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js1
-rw-r--r--deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js1
11 files changed, 11 insertions, 1 deletions
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
index fd4e03a897..f23049dc3b 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
@@ -1,6 +1,6 @@
# brace-expansion
-[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html),
+[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html),
as known from sh/bash, in JavaScript.
[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.png)](http://travis-ci.org/juliangruber/brace-expansion)
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js
index 36cde4de5c..60ecfc74d4 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js
@@ -5,3 +5,4 @@ console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.bak b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.bak
index ed35e15af3..71b53671d7 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.bak
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.bak
@@ -195,3 +195,4 @@ function expand(str, isTop) {
return expansions;
}
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js
index f8d40f79ac..a23104e955 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js
@@ -188,3 +188,4 @@ function expand(str, isTop) {
return expansions;
}
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
index dd2730cfde..fa5da71a6d 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
@@ -3,3 +3,4 @@ test:
@node_modules/.bin/tape test/*.js
.PHONY: test
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
index 9ce76f480a..c02ad348e6 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
@@ -2,3 +2,4 @@ var balanced = require('./');
console.log(balanced('{', '}', 'pre{in{nested}}post'));
console.log(balanced('{', '}', 'pre{first}between{second}post'));
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
index fd1132826a..e429121eab 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
@@ -7,3 +7,4 @@ test('empty option', function(t) {
]);
t.end();
});
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
index 54d1e88f68..0862dc51f9 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
@@ -13,3 +13,4 @@ test('nested', function(t) {
]);
t.end();
});
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
index d5f62566c9..c00ad155fe 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
@@ -7,3 +7,4 @@ test('order', function(t) {
]);
t.end();
});
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
index f830f7c466..e4158775f1 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
@@ -10,3 +10,4 @@ test('pad', function(t) {
]);
t.end();
});
+
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
index 18ee665fb9..f73a9579ab 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
+++ b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
@@ -47,3 +47,4 @@ test('alphabetic sequences with step count', function(t) {
]);
t.end();
});
+