diff options
author | 2016-02-03 11:37:16 +0200 | |
---|---|---|
committer | 2016-02-03 11:37:16 +0200 | |
commit | dc1403671fb5321730d951f7ce227eaa4b375ad9 (patch) | |
tree | 9fc222083cdb051485c5fc010ec700f4588d98ac /.gitignore | |
parent | dda9b08e2b57f785b71bccf4dab57ef4b2fb1dc3 (diff) | |
parent | be5cbb4162b88f311ae4712049698a779258c69d (diff) |
Merge branch 'master' into scapy2
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -25,6 +25,9 @@ scripts/doc/* scripts/mock-* scripts/automation/trex_control_plane/doc/_build/* +scripts/exp/http1_with_option_ipv6.pcap +scripts/exp/http1_with_option.pcap +scripts/stl/exportedFile.pcap scripts/exp/stl_multi_burst1-0.erf scripts/exp/stl_multi_pkt1-0.erf scripts/exp/stl_multi_pkt2-0.erf @@ -56,7 +59,10 @@ scripts/exp/stl_vm_random_size_64_128.pcap scripts/automation/regression/reports/unit_test.xml scripts/automation/regression/unit_tests/functional_tests/test.pcap - +#files generated by global +src/GPATH +src/GRTAGS +src/GTAGS |