1 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f0e10ec37a..37faa71e695 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * pcvs-defs.el (cvs-menu): Add cvs-mode-mark and cvs-mode-unmark.
+
 2005-06-21  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * calendar/appt.el (appt-make-list): Activate the package, if
@@ -541,6 +545,7 @@
         variables, unless either `gtk' is boundp or this isn't a
         `windows-nt' build.
 
+>>>>>>> 1.7817
 2005-06-13  Lute Kamstra  <lute@gnu.org>
 
         * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
@@ -1448,6 +1453,7 @@
 
         * simple.el (filter-buffer-substring): Fix typo in docstring.
 
+>>>>>>> 1.7768
 2005-05-31  Richard M. Stallman  <rms@gnu.org>
 
         * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
@@ -1484,6 +1490,7 @@
         * textmodes/tex-mode.el (tex-compile-commands, tex-compile)
         (tex-start-tex): Undo all but the last part of the 2005-05-28 change.
 
+>>>>>>> 1.7646
 2005-05-30  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * calendar/diary-lib.el (mark-included-diary-files): Only kill