Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/libpcap

author Michael Richardson <[email protected]>

Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)

committer Michael Richardson <[email protected]>

Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)
author Michael Richardson <[email protected]>
Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)
committer Michael Richardson <[email protected]>
Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
author	Michael Richardson <[email protected]>
	Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)
committer	Michael Richardson <[email protected]>
	Thu, 13 Nov 2014 08:34:02 +0000 (22:34 -1000)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history