Mercurial > emacs

diff lisp/ChangeLog @ 29707:a70985b2a88f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 17 Jun 2000 15:36:33 +0000
parents c09fad42c6c2
children 684342d36151
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Jun 17 15:35:59 2000 +0000
+++ b/lisp/ChangeLog	Sat Jun 17 15:36:33 2000 +0000
@@ -1,3 +1,7 @@
+2000-06-17  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* time.el: Remove trailing ^M that prevent CVS-merging.
+
 2000-06-16  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* Makefile.in (srcdir): Define for update-subdirs.