Git bug??? -- Remove duplicate ChangeLog entries

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ece33e..8284d9c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,15 +12,6 @@
        buffer exists, which it doesn't if we haven't started Gnus.
        (gnus-summary-exit): Allow quitting when we don't have a group buffer.
 
-2012-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       pgg-def.el, pgg-gpg.el, pgg-parse.el, pgg-pgp.el, pgg-pgp5.el, pgg.el:
-       Remove.
-
-       dgnushack.el (pgg-snarf-keys-region): Remove autoload.
-
-       lpath.el (pgg-parse-crc24-string, pgg-parse-crc24): Remove declaration.
-
 2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * mml.el (mml-generate-mime): Allow specifying what the top-level part
@@ -58,10 +49,6 @@
        * binhex.el, hashcash.el, uudecode.el:
        Remove * characters from the front of variable docstrings.
 
-2012-04-05  Bastien Guerry  <bzg@altern.org>
-
-       * color.el (color-lighten-name): Fix typo.
-
 2012-04-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * shr.el (shr-find-fill-point): Remove unused code; don't break a line

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5d9bb81..d891706 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -31,6 +31,11 @@
 
        * gnus-faq.texi (FAQ 8-2): Mention EasyPG.
 
+2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+
+       * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
+       reflect the new default.
+
 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Client-Side IMAP Splitting): Note that `nnimap-inbox' now
@@ -41,44 +46,6 @@
        * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook
        and gnus-gcc-post-body-encode-hook.
 
-2012-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * epa.texi: New file imported from Emacs.
-
-       * pgg.texi: Remove.
-
-       * Makefile.in: Replace pgg.* with epa.*.
-
-2012-04-05  Teodor Zlatanov  <tzz@lifelogs.com>
-
-       * auth.texi (Secret Service API): Edit further and give examples.
-       (Secret Service API): Adjust @samp to @code for collection names.
-
-2012-04-04  Glenn Morris  <rgm@gnu.org>
-
-       * auth.texi (Secret Service API): Copyedits.
-       (Help for developers): Fill in some missing function doc-strings.
-       (Help for users, Help for developers)
-       (GnuPG and EasyPG Assistant Configuration): Markup fixes.
-
-2012-04-04  Michael Albinus  <michael.albinus@gmx.de>
-
-       * auth.texi (Secret Service API): Add the missing text.
-
-2012-04-04  Chong Yidong  <cyd@gnu.org>
-
-       * message.texi (Using PGP/MIME): Note that epg is now the default.
-
-       * gnus.texi: Reduce references to obsolete pgg library.
-       (Security): Note that epg is now the default.
-
-       * gnus-faq.texi (FAQ 8-2): Mention EasyPG.
-
-2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
-
-       * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
-       reflect the new default.
-
 2012-02-28  Glenn Morris  <rgm@gnu.org>
 
        * gnus-faq.texi, gnus-news.texi, gnus.texi: