diff options
| author | Glenn Morris | 2011-01-15 12:42:23 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-15 12:42:23 -0800 |
| commit | 6fffc9003cf1a2677f04f6bc53ee96029816b3a9 (patch) | |
| tree | 2025da26937271e5fe559518beff9597d712b904 /admin/ChangeLog | |
| parent | d52969e8afaa19ed1acc01f4ff0bb651bf7869a7 (diff) | |
| download | emacs-6fffc9003cf1a2677f04f6bc53ee96029816b3a9.tar.gz emacs-6fffc9003cf1a2677f04f6bc53ee96029816b3a9.zip | |
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 5807863a910..0fdd0967892 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-missing): Add another skip indicator. | ||
| 4 | (bzrmerge-resolve): Also ignore cl-loaddefs.el. | ||
| 5 | |||
| 1 | 2011-01-14 Glenn Morris <rgm@gnu.org> | 6 | 2011-01-14 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. | 8 | * admin.el (set-copyright): Also handle \year in refcards/*.tex. |