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 8d68bea121ad28cebac00715f2a68465024cf189..3c4f0f99af1975415dbfb43ea276af344f8e7a82 100644 (file)
--- 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.  [email protected].
+  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.  [email protected].
   Summary for 4.1.1 tcpdump release