summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDan Klein <danklei@cisco.com>2015-08-23 18:52:11 +0300
committerDan Klein <danklei@cisco.com>2015-08-23 18:52:11 +0300
commit651a7d779551e193bd9dbadbe8b2a02bdab231b4 (patch)
treea42cb5ab0eca820899f9fedf538eef8d83ad4383 /.gitignore
parent84bb24ace632141dd5ece01d5f4985239014f660 (diff)
parent3bfe53394f43a37ce02b09c6420751027c602047 (diff)
Merge branch 'master' into dan_latest
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5b956fd0..5f5dc3a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ linux_dpdk*
linux*
scripts/_t-rex-*
scripts/bp-sim-*
+scripts/doc/*
+scripts/mock-*
*.pyc
@@ -43,6 +45,11 @@ scripts/bp-sim-*
ehthumbs.db
Thumbs.db
+
# IDE/ Editors files #
######################
.idea/
+*.vpj
+*.vpw
+*.vtg
+*.vpwhist