]> The Tcpdump Group git mirrors - libpcap/commitdiff
Merge branch 'timestamps' of https://github.com/msekletar/libpcap
authorGuy Harris <[email protected]>
Mon, 1 Jul 2013 18:21:25 +0000 (11:21 -0700)
committerGuy Harris <[email protected]>
Mon, 1 Jul 2013 18:21:25 +0000 (11:21 -0700)
It says "Please enter a commit message to explain why this merge is
necessary".  I guess this merge is necessary because Git says it's
necessary.  Mysterious are the ways of Git.

1  2 
configure.in
pcap-int.h
pcap.c

diff --cc configure.in
Simple merge
diff --cc pcap-int.h
Simple merge
diff --cc pcap.c
Simple merge