# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 972499441 0
# Node ID ea7ff2803d21cf3ea30ece850829578860b16dd6
# Parent  b8e6731f8f7bb07cb453c9fd4c0fe4806d4c333a
*** empty log message ***

diff -r b8e6731f8f7b -r ea7ff2803d21 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 25 13:41:19 2000 +0000
+++ b/lisp/ChangeLog	Wed Oct 25 18:44:01 2000 +0000
@@ -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