]> The Tcpdump Group git mirrors - libpcap/commitdiff
projects / libpcap / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da55d8b e45fc48)
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/libpcap
authorMichael Richardson <[email protected]>
Wed, 7 Apr 2010 16:05:35 +0000 (12:05 -0400)
committerMichael Richardson <[email protected]>
Wed, 7 Apr 2010 16:05:35 +0000 (12:05 -0400)
Conflicts:

VERSION


Trivial merge
[mirror] the LIBpcap interface to various kernel packet capture mechanism