From: Michael Richardson <mcr@sandelman.ottawa.on.ca>
Date: Thu, 13 May 2010 18:23:17 +0000 (-0400)
Subject: give credit to Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
X-Git-Tag: tcpdump-4.2.1~109
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/896b5de8fce59f91a479de0bc55539f02425530a

give credit to Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

diff --git a/CHANGES b/CHANGES
index 33f453b7..8d68bea1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+  Summary for 4.1.+
+        merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov at gmail dot com>
+
+
 Thu.	April 1, 2010.  guy@alum.mit.edu.
   Summary for 4.1.1 tcpdump release
 	Fix build on systems with PF, such as FreeBSD and OpenBSD.
diff --git a/CREDITS b/CREDITS
index 0a3b56eb..a89a2f1d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -48,6 +48,7 @@ Additional people who have contributed patches:
 	David Horn			<dhorn2000 at gmail dot com>
 	David Smith			<dsmith at redhat dot com>
 	David Young			<dyoung at ojctech dot com>
+        Dmitry Eremin-Solenikov         <dbaryshkov at gmail dot com>
 	Don Ebright			<Don dot Ebright at compuware dot com>
 	Eddie Kohler			<xexd at sourceforge dot net>
 	Elmar Kirchner			<elmar at juniper dot net>