aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-23 01:16:40 -0800
committerGlenn Morris2010-11-23 01:16:40 -0800
commitf98a3c94837dbaccfed3d6ea52931a985f7db9df (patch)
treed246561e6b3ab12d57f9dc1eb400422813803ab3
parent17a6e2788d7b2b9f95bef9af3cf6b49786ebc0a1 (diff)
downloademacs-f98a3c94837dbaccfed3d6ea52931a985f7db9df.tar.gz
emacs-f98a3c94837dbaccfed3d6ea52931a985f7db9df.zip
ChangeLog fix for initial nxml import.
-rw-r--r--lisp/ChangeLog.138
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index c5a51f813a7..3d8a2b0aa3b 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -6680,8 +6680,9 @@
6680 buffer if the parent buffer is in vc-dired-mode. 6680 buffer if the parent buffer is in vc-dired-mode.
6681 6681
66822007-11-23 Mark A. Hershberger <mah@everybody.org> 66822007-11-23 Mark A. Hershberger <mah@everybody.org>
6683 James Clark <jjc@public.jclark.com>
6683 6684
6684 * nxml: Initial merge of nxml. Kept nxml/char-name subdir for now. 6685 * nxml/: Initial merge of nxml. Kept nxml/char-name subdir for now.
6685 6686
66862007-11-23 Juri Linkov <juri@jurta.org> 66872007-11-23 Juri Linkov <juri@jurta.org>
6687 6688
@@ -16693,10 +16694,9 @@ See ChangeLog.12 for earlier changes.
16693 16694
16694;; Local Variables: 16695;; Local Variables:
16695;; coding: utf-8 16696;; coding: utf-8
16696;; add-log-time-zone-rule: t
16697;; End: 16697;; End:
16698 16698
16699 Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 16699 Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
16700 16700
16701 This file is part of GNU Emacs. 16701 This file is part of GNU Emacs.
16702 16702
@@ -16712,5 +16712,3 @@ See ChangeLog.12 for earlier changes.
16712 16712
16713 You should have received a copy of the GNU General Public License 16713 You should have received a copy of the GNU General Public License
16714 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 16714 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
16715
16716;; arch-tag: 1e8aa93a-fc6c-4ac3-9b10-1f445e1840af