emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/ChangeLog


From: Colin Walters
Subject: [Emacs-diffs] Changes to emacs/lisp/ChangeLog
Date: Wed, 10 Apr 2002 15:12:52 -0400

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.3689 emacs/lisp/ChangeLog:1.3690
*** emacs/lisp/ChangeLog:1.3689 Wed Apr 10 15:10:50 2002
--- emacs/lisp/ChangeLog        Wed Apr 10 15:12:52 2002
***************
*** 131,144 ****
  
        * files.el (display-time-string): Fix last change.
  
- <<<<<<< ChangeLog
- >>>>>>> 1.3683
- =======
  2002-04-07  Sam Steingold  <address@hidden>
  
        * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
  
- >>>>>>> 1.3687
  2002-04-07  Jason Rumney  <address@hidden>
  
        * international/mule-cmds.el (set-default-coding-systems)
--- 131,140 ----
***************
*** 152,158 ****
  
        * simple.el (play-sound): Move to subr.el.
  
- >>>>>>> 1.3679
  2002-04-06  Richard M. Stallman  <address@hidden>
  
        * files.el (display-time-string-forms): Mark as risky.
--- 148,153 ----



reply via email to

[Prev in Thread] Current Thread [Next in Thread]