comparison lisp/gnus/ChangeLog @ 87135:04590cd6c71c

Resolve commit conflict.
author Deepak Goel <deego@gnufans.org>
date Thu, 06 Dec 2007 17:18:13 +0000
parents 90b29ef76212
children 9c91533a901a
comparison
equal deleted inserted replaced
87134:23c6fc4561ea 87135:04590cd6c71c
1 2007-12-06 D. Goel <deego3@gmail.com>
2
3
4 * gnus-art.el (article-make-date-line): Fix buggy call to `error'.
5 * gnus-start.el (gnus-load): Ditto.
6
1 2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org> 7 2007-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
2 8
3 * gnus-art.el (gnus-use-idna) 9 * gnus-art.el (gnus-use-idna)
4 * gnus-start.el (gnus-site-init-file) 10 * gnus-start.el (gnus-site-init-file)
5 * message.el (message-use-idna) 11 * message.el (message-use-idna)
55 61
56 * rfc2047.el (rfc2047-encoded-word-regexp) 62 * rfc2047.el (rfc2047-encoded-word-regexp)
57 (rfc2047-encoded-word-regexp-loose): Move forward; add comments 63 (rfc2047-encoded-word-regexp-loose): Move forward; add comments
58 explaining what regexp patterns are for. 64 explaining what regexp patterns are for.
59 65
66 >>>>>>> 1.607
60 2007-12-04 Glenn Morris <rgm@gnu.org> 67 2007-12-04 Glenn Morris <rgm@gnu.org>
61 68
62 * password.el: Move to ../password-cache.el. 69 * password.el: Move to ../password-cache.el.
63 70
64 * mml1991.el (password-read, password-cache-add, password-cache-remove): 71 * mml1991.el (password-read, password-cache-add, password-cache-remove):