Mercurial > emacs
changeset 29707:a70985b2a88f
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 17 Jun 2000 15:36:33 +0000 |
| parents | 1030e638c8dd |
| children | f37b857741b1 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
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.