mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Resolve commit conflict.

Browse source
This commit is contained in:
Deepak Goel 2007-12-06 17:18:13 +00:00
parent 2e564b0dc5
commit fd0c71e869
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/gnus/ChangeLog
View file

@ -1,3 +1,9 @@
2007-12-06 D. Goel <deego3@gmail.com>
* gnus-art.el (article-make-date-line): Fix buggy call to `error'.
* gnus-start.el (gnus-load): Ditto.
2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-use-idna)
@ -57,6 +63,7 @@
(rfc2047-encoded-word-regexp-loose): Move forward; add comments
explaining what regexp patterns are for.
>>>>>>> 1.607
2007-12-04 Glenn Morris <rgm@gnu.org>
* password.el: Move to ../password-cache.el.