Merge pull request #358 from bonsaiviking/config-packet-ring

author Michael Richardson <[email protected]>

Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)

committer Michael Richardson <[email protected]>

Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)
author Michael Richardson <[email protected]>
Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)
committer Michael Richardson <[email protected]>
Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)
diff --cc configure.in
Simple merge
diff --cc pcap-linux.c
Simple merge
author	Michael Richardson <[email protected]>
	Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)
committer	Michael Richardson <[email protected]>
	Sun, 15 Feb 2015 17:28:32 +0000 (12:28 -0500)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
pcap-linux.c	patch \|	diff1 \|	diff2 \|	blob \| history