aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2015-09-24 10:42:54 -0700
committerGravatar Michael Lumish <mlumish@google.com>2015-09-24 10:42:54 -0700
commit9e71674ab942c748f24e945327424163c15b5e66 (patch)
tree75ff3a8a21f7914223351fd37e6dfa6d81bf7338 /.gitignore
parent40a595135dc962f7f9c32d841b5829f9152f6b16 (diff)
parentc1385d6705bbf2ea57d6d322d2d62bda85685d7f (diff)
Merge pull request #3459 from ctiller/its-a-gyp
Fix (hackily) fling_stream_test under gyp
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 45f8fdaa46..8dc459ea27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,7 @@ report.xml
# port server log
portlog.txt
+
+# gyp generated make files
+*-gyp.mk
+out \ No newline at end of file