aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Nelson <trent.a.b.nelson@gmail.com>2014-02-18 12:01:20 -0700
committerTrent Nelson <trent.a.b.nelson@gmail.com>2014-02-18 12:01:20 -0700
commit143f24911e87c63bb21bc34608e752ce5e2ddbfc (patch)
tree974cde767becce94291d3ccbcd993d772da38f1b
parent6204232bd6c41b970cf333f32e38eca54211a90d (diff)
parent9f595f900cce4e4db9bdec583a7a62cb3545f177 (diff)
Merge pull request #4230 from alexmaloteaux/gitignore_fixes
gitignore on test-driver and netbeans
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 65ca4a601a..555417fb90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,8 @@ config.log
.project
.cproject
+/nbproject
+
# /
/.dummy
/.dummy.in
@@ -210,6 +212,7 @@ lib/cmyth/Makefile
/lib/gtest/build-aux/config.h
/lib/gtest/build-aux/config.h.in~
/lib/gtest/build-aux/stamp-h1
+/lib/gtest/build-aux/test-driver
/lib/gtest/fused-src/
/lib/gtest/lib/
/lib/gtest/libtool