diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 22:55:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 23:07:16 -0800 |
| commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
| tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /lisp/ChangeLog.7 | |
| parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
Merge branch 'emacs-24'.
Diffstat (limited to 'lisp/ChangeLog.7')
| -rw-r--r-- | lisp/ChangeLog.7 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 093f467163..7c55397028 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -2749,7 +2749,7 @@ * abbrev.el: Likewise. 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> - Karl Fogel <kfogel@red-bean.com> + Karl Fogel <kfogel@red-bean.com> * bookmark.el: Changes so bookmark list mode works with Info: (bookmark-jump-noselect): Use an inner save-window-excursion. @@ -23110,8 +23110,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, - Inc. + Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. |