diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
| commit | 9b7170b8e9b174a155d297c563f91b89bdb11b33 (patch) | |
| tree | d6bf69daee921ff8d910262585349e5e78d9b054 /lisp/ChangeLog.13 | |
| parent | d1be0cedcc256ac5fca860a9324d8af80d3ab89e (diff) | |
| parent | 89b5036205b8c8b12d36ea8514deab1932225b1d (diff) | |
| download | emacs-9b7170b8e9b174a155d297c563f91b89bdb11b33.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/ChangeLog.13')
| -rw-r--r-- | lisp/ChangeLog.13 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index f37022d31e2..2607bb9b39f 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -6680,8 +6680,9 @@ buffer if the parent buffer is in vc-dired-mode. 2007-11-23 Mark A. Hershberger <mah@everybody.org> + James Clark <none@example.com> - * nxml: Initial merge of nxml. Kept nxml/char-name subdir for now. + * nxml/: Initial merge of nxml. Kept nxml/char-name subdir for now. 2007-11-23 Juri Linkov <juri@jurta.org> @@ -16693,10 +16694,9 @@ See ChangeLog.12 for earlier changes. ;; Local Variables: ;; coding: utf-8 -;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -16712,5 +16712,3 @@ See ChangeLog.12 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - -;; arch-tag: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af |