diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/gnus/ChangeLog | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/gnus/ChangeLog')
| -rw-r--r-- | lisp/gnus/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 870164023d5..9fffc4f1a45 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2013-03-26 Andrew Cohen <cohen@bu.edu> | ||
| 2 | |||
| 3 | * nnir.el: Major rewrite. Cleaner separation between searches and group | ||
| 4 | management. Marks are now shown in nnir summary buffers. Rudimentary | ||
| 5 | support for real (i.e. not ephemeral) nnir groups. | ||
| 6 | (gnus-summary-make-nnir-group): New function for initiating searches | ||
| 7 | from a summary buffer. | ||
| 8 | |||
| 9 | 2013-03-18 Sam Steingold <sds@gnu.org> | ||
| 10 | |||
| 11 | * message.el (message-bury): Minor cleanup. | ||
| 12 | |||
| 1 | 2013-03-06 Katsumi Yamaoka <yamaoka@jpl.org> | 13 | 2013-03-06 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 14 | ||
| 3 | * nndir.el (nndir-request-list): Remove 2nd argument passed to | 15 | * nndir.el (nndir-request-list): Remove 2nd argument passed to |