Skip to content

Commit

Permalink
Merge branch 'master' of github.com:brock7/scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Brock committed Nov 23, 2014
2 parents c9075f2 + b6c7854 commit dbf5987
Show file tree
Hide file tree
Showing 3,754 changed files with 7,163 additions and 25,900 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions Intersect-2.0/Intersect2-Beta.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import getpass
import pwd

conf = object()
conf.verb = 1
cut = lambda s: str(s).split("\0",1)[0]

logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
Expand Down
Loading

0 comments on commit dbf5987

Please sign in to comment.