diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
| commit | 8c406a9bc42ee77fcbbb4201fe8bda855eafd832 (patch) | |
| tree | 14c8fa2e72341edd9db40b17079fd5208b1554c8 /lisp/ChangeLog.12 | |
| parent | 9bdeb5e9bedd773cc6845bc29a98e1e2a208f1ff (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
Diffstat (limited to 'lisp/ChangeLog.12')
| -rw-r--r-- | lisp/ChangeLog.12 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 957d9a51bb4..2d4882a8b1e 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -1092,8 +1092,8 @@ North American rule. Replace "daylight savings" with "daylight saving" in doc. - * calendar/cal-china.el,cal-dst.el,calendar.el,diary-lib.el: - * calendar/lunar.el,solar.el: Replace "daylight savings" with + * calendar/cal-china.el, cal-dst.el, calendar.el, diary-lib.el: + * calendar/lunar.el, solar.el: Replace "daylight savings" with "daylight saving" in text. * woman.el (woman-change-fonts): Tweak previous change by using @@ -8709,7 +8709,7 @@ * term.el (term-handle-scroll, term-delete-lines) (term-insert-lines): Fix off by one errors. -2006-06-15 Katsumi Yamaoka <yamaoka@jpl.org> (tiny change) +2006-06-15 Katsumi Yamaoka <yamaoka@jpl.org> * net/tramp.el (tramp-touch): Use UTC to express time. @@ -22969,7 +22969,7 @@ * menu-bar.el (menu-bar-showhide-menu): Add `showhide-battery'. -2005-08-09 Katsumi Yamaoka <yamaoka@jpl.org> (tiny change) +2005-08-09 Katsumi Yamaoka <yamaoka@jpl.org> * net/ange-ftp.el (ange-ftp-send-cmd): Make it work properly with uploading files. |