diff options
author | Dan Klein <danklei@cisco.com> | 2015-08-23 18:52:11 +0300 |
---|---|---|
committer | Dan Klein <danklei@cisco.com> | 2015-08-23 18:52:11 +0300 |
commit | 651a7d779551e193bd9dbadbe8b2a02bdab231b4 (patch) | |
tree | a42cb5ab0eca820899f9fedf538eef8d83ad4383 /.gitignore | |
parent | 84bb24ace632141dd5ece01d5f4985239014f660 (diff) | |
parent | 3bfe53394f43a37ce02b09c6420751027c602047 (diff) |
Merge branch 'master' into dan_latest
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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 |