Delete duplicate entries

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 610eb96..f048616 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -67,8 +67,7 @@
        (nntp-save-marks, nntp-open-marks, nntp-possibly-create-directory)
        (nntp-server-to-method-cache): Remove.
 
-       * shr.el (shr-rescale-image): Allow viewing large images.
-       (shr-rescale-image): Fix wrong merge.
+       * shr.el (shr-rescale-image): Fix wrong merge.
 
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -212,10 +211,6 @@
        lines that are narrower than the window width.  Otherwise background
        "blocks" will look less readable.
 
-2012-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
-
 2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-transform-headers): Remove unused variable.
@@ -237,11 +232,6 @@
        * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
        buffer if `gnus-kill-summary-on-exit' is nil.
 
-2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * gnus-sum.el (gnus-summary-show-thread):
-       next-single-char-property-change may return nil in XEmacs.
-
 2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus
@@ -383,7 +373,7 @@
 2012-01-31  Jim Meyering  <jim@meyering.net>
 
        * gnus-agent.el (gnus-agent-expire-unagentized-dirs):
-        Correct a comment (insert "not") and hide nominally-doubled "to".
+       Correct a comment (insert "not") and hide nominally-doubled "to".
 
 2012-01-31  Lars Ingebrigtsen  <larsi@gnus.org>