From 76668788b504bdfce0521492a4da5d3cd4de2eeb Mon Sep 17 00:00:00 2001
From: Nick Roberts <nickrob@snap.net.nz>
Date: Fri, 3 Jun 2005 11:23:08 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5203229a93..b098adbf548 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-03  Matt Hodges  <MPHodges@member.fsf.org>
+
+	* tmm.el (tmm-inactive-face): New face.
+	(tmm-remove-inactive-mouse-face): New function.
+	(tmm-prompt, tmm-add-one-shortcut)
+	(tmm-add-prompt, tmm-get-keymap): Make active menu items visible
+	but not selectable.
+
 2005-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
 	* faces.el (face-equal): Improve argument/docstring consistency.
@@ -26,6 +34,7 @@
 
 	* viper.el (viper-non-hook-settings): Fixed the names of defadvices.
 
+>>>>>>> 1.7661
 2005-06-01  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* autorevert.el (auto-revert-buffers): Use save-match-data.
-- 
2.39.5