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

[Romain Francoise]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8458 emacs/lisp/ChangeLog:1.8459
*** emacs/lisp/ChangeLog:1.8458 Wed Oct 26 01:00:30 2005
--- emacs/lisp/ChangeLog        Wed Oct 26 08:38:07 2005
***************
*** 1,3 ****
--- 1,7 ----
+ 2005-10-26  Romain Francoise  <address@hidden>
+ 
+       * smerge-mode.el: Add 'tools' to file keywords.
+ 
  2005-10-26  Nick Roberts  <address@hidden>
  
        * progmodes/gud.el (gud-menu-map): Only display gud-until icon