/[emacs]/emacs/lisp/ChangeLog
ViewVC logotype

Diff of /emacs/lisp/ChangeLog

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3689 by walters, Wed Apr 10 19:10:50 2002 UTC revision 1.3690 by walters, Wed Apr 10 19:12:52 2002 UTC
# Line 131  Line 131 
131    
132          * files.el (display-time-string): Fix last change.          * files.el (display-time-string): Fix last change.
133    
 <<<<<<< ChangeLog  
 >>>>>>> 1.3683  
 =======  
134  2002-04-07  Sam Steingold  <sds@gnu.org>  2002-04-07  Sam Steingold  <sds@gnu.org>
135    
136          * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.          * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
137    
 >>>>>>> 1.3687  
138  2002-04-07  Jason Rumney  <jasonr@gnu.org>  2002-04-07  Jason Rumney  <jasonr@gnu.org>
139    
140          * international/mule-cmds.el (set-default-coding-systems)          * international/mule-cmds.el (set-default-coding-systems)
# Line 152  Line 148 
148    
149          * simple.el (play-sound): Move to subr.el.          * simple.el (play-sound): Move to subr.el.
150    
 >>>>>>> 1.3679  
151  2002-04-06  Richard M. Stallman  <rms@gnu.org>  2002-04-06  Richard M. Stallman  <rms@gnu.org>
152    
153          * files.el (display-time-string-forms): Mark as risky.          * files.el (display-time-string-forms): Mark as risky.

Legend:
Removed from v.1.3689  
changed lines
  Added in v.1.3690

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26