]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Merge remote-tracking branch 'origin/tcpdump_4_7_cve' into tcpdump-4.7
authorMichael Richardson <[email protected]>
Mon, 9 Mar 2015 19:07:32 +0000 (15:07 -0400)
committerMichael Richardson <[email protected]>
Mon, 9 Mar 2015 19:07:32 +0000 (15:07 -0400)
1  2 
VERSION

diff --cc VERSION
index f6cdf40983ffd7c7de50f37264a6e5d03b5b0b50,9fd56319967da0957d3374e53b10a5a901f50ccf..af9764a59e12f3233d1453100d4000dd46be8e11
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 4.7.0
 -4.8.0-PRE-GIT
++4.7.2