From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 25 Oct 2000 18:44:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~575
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17c25cea2167018dd1d3998117ba971c2c0cc677;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7060060c815..fe89ecd89e7 100644
--- 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