*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7060060c8159d079bbe1e227ab91305042722fe8..fe89ecd89e7f23d09994fbf8277db01ff48c7aac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-25  Jason Rumney  <jasonr@gnu.org>
+
+       * cus-edit.el (custom-button-face, custom-button-pressed-face):
+       Merge x w32 and mac definitions.
+
 2000-10-25  Gerd Moellmann  <gerd@gnu.org>
 
        * menu-bar.el (menu-bar-options-menu): Add a help string for