From 46173e82d3681a6574ae125dee048b9ee6b112f1 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 12 Apr 2012 22:58:52 +0000 Subject: [PATCH] Git bug??? -- Remove duplicate ChangeLog entries --- lisp/ChangeLog | 13 ------------- texi/ChangeLog | 43 +++++-------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ece33e03..8284d9c2e 100644 --- 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 - - 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 * 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 - - * color.el (color-lighten-name): Fix typo. - 2012-04-02 Katsumi Yamaoka * shr.el (shr-find-fill-point): Remove unused code; don't break a line diff --git a/texi/ChangeLog b/texi/ChangeLog index 5d9bb81df..d89170683 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -31,6 +31,11 @@ * gnus-faq.texi (FAQ 8-2): Mention EasyPG. +2012-03-22 Peder O. Klingenberg (tiny change) + + * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to + reflect the new default. + 2012-03-22 Lars Magne Ingebrigtsen * 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 - - * epa.texi: New file imported from Emacs. - - * pgg.texi: Remove. - - * Makefile.in: Replace pgg.* with epa.*. - -2012-04-05 Teodor Zlatanov - - * 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 - - * 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 - - * auth.texi (Secret Service API): Add the missing text. - -2012-04-04 Chong Yidong - - * 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 (tiny change) - - * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to - reflect the new default. - 2012-02-28 Glenn Morris * gnus-faq.texi, gnus-news.texi, gnus.texi: -- 2.25.1