From: Michael Richardson <mcr@sandelman.ca>
Date: Sat, 19 Jul 2014 17:50:32 +0000 (-0400)
Subject: Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
X-Git-Tag: tcpdump-4.7.0-bp~46^2~11
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/16a592dcadb25d2262d64f3811cb2da5e42e1846?hp=084185e1f2c6d47a79b1e4ccea3be408fe6328d7

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

diff --git a/CHANGES b/CHANGES
index afb14b49..c07efbfb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Saturday Jul. 19, 2014 mcr@sandelman.ca
+  Summary for 4.6.1 tcpdump release
+	added FreeBSD capsicum
+	add a short option '#', same as long option '--number'
+
 Wednesday Jul. 2, 2014 mcr@sandelman.ca
   Summary for 4.6.0 tcpdump release
         all of tcpdump is now using the new "NDO" code base (Thanks Denis!)