# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1013482779 0
# Node ID 9e2bfc2d4d230ab67c58854bf7fdd68a70608ae7
# Parent  4c5a2e2ddf4339bcab0e54a89c9d64cb62a36164
*** empty log message ***

diff -r 4c5a2e2ddf43 -r 9e2bfc2d4d23 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 12 02:59:05 2002 +0000
+++ b/lisp/ChangeLog	Tue Feb 12 02:59:39 2002 +0000
@@ -1,3 +1,7 @@
+2002-02-12  Miles Bader  <miles@gnu.org>
+
+	* faces.el (mode-line-inactive): Add dark-background variant.
+
 2002-02-11  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* toolbar/tool-bar.el (tool-bar-mode): Removed standard value.
@@ -239,6 +243,7 @@
 	* cus-start.el (x-use-underline-position-properties):
 	Allow customization.
 
+>>>>>>> 1.3434
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
 	* dired.el (dired-load-hook, dired-mode-hook)