Rudimentary support for vc-pull and vc-merge in Git and Mercurial.

[bpt/emacs.git] / lisp / ChangeLog.13

diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 8ce74b4..8cbe1ad 100644 (file)
--- 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>
 
@@ -13493,7 +13494,7 @@
        * menu-bar.el (menu-bar-vc-filter): New function.
        (menu-bar-tools-menu): Use it as a filter.
 
-2007-08-01  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
+2007-08-01  Eric Hanchrow  <offby1@blarg.net>
 
        * ibuf-ext.el (ibuffer-mark-old-buffers): Docstring fix.
 
@@ -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-2011  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