From: Guy Harris <guy@alum.mit.edu>
Date: Tue, 20 Jul 2010 18:28:16 +0000 (-0700)
Subject: List the 4.1.x fixes we've checked in so far.
X-Git-Tag: tcpdump-4.2.1~99
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/91afccb253a5f4d94c3a8d98a8fe24df23f10c38

List the 4.1.x fixes we've checked in so far.

Also, clean up the item for the post-4.1.x changes.
---

diff --git a/CHANGES b/CHANGES
index 8d68bea1..3c4f0f99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
-  Summary for 4.1.+
-        merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov at gmail dot com>
-
+  Summary for 4.2.+
+	merged 802.15.4 decoder from Dmitry Eremin-Solenikov <dbaryshkov
+	  at gmail dot com>
+
+Tue.    July 20, 2010.  guy@alum.mit.edu.
+  Summary for 4.1.2 tcpdump release
+	If -U is specified, flush the file after creating it, so it's
+	  not zero-length
+	Fix TCP flags output description, and some typoes, in the man
+	  page
+	Add a -h flag, and only attempt to recognize 802.11s mesh
+	  headers if it's set
+	When printing the link-layer type list, send *all* output to
+	  stderr
+	Include the CFLAGS setting when configure was run in the
+	  compiler flags
 
 Thu.	April 1, 2010.  guy@alum.mit.edu.
   Summary for 4.1.1 tcpdump release