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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/09/03 16:48:06

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11683
retrieving revision 1.11684
diff -u -b -r1.11683 -r1.11684
--- ChangeLog   3 Sep 2007 06:25:12 -0000       1.11683
+++ ChangeLog   3 Sep 2007 16:48:04 -0000       1.11684
@@ -1,3 +1,7 @@
+2007-09-03  Emanuele Giaquinta <address@hidden>  (tiny change)
+
+       * loadup.el: Fix merge problem, only load "button" once.
+
 2007-09-03  Glenn Morris  <address@hidden>
 
        * vc-svn.el (vc-svn-print-log): If there is only one file, use