# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1095456342 0
# Node ID d46ee84c77e65aae874ec890ba54fac152c9273b
# Parent  3cbeddf703796ec9162fd748021e43c939c0068b
*** empty log message ***

diff -r 3cbeddf70379 -r d46ee84c77e6 etc/ChangeLog
--- a/etc/ChangeLog	Fri Sep 17 21:10:20 2004 +0000
+++ b/etc/ChangeLog	Fri Sep 17 21:25:42 2004 +0000
@@ -1,3 +1,8 @@
+2004-09-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* e/eterm.ti: Change the strings for smso and rmso.
+          e/eterm: Regenerate.
+
 2004-09-09  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* MORE.STUFF (EDB): Update entry.
diff -r 3cbeddf70379 -r d46ee84c77e6 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 17 21:10:20 2004 +0000
+++ b/lisp/ChangeLog	Fri Sep 17 21:25:42 2004 +0000
@@ -1,5 +1,16 @@
 2004-09-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* ediff-init.el (ediff-current-diff-face-A)
+	(ediff-current-diff-face-B, ediff-current-diff-face-C)
+	(ediff-current-diff-face-Ancestor)
+	(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
+	(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
+	(ediff-even-diff-face-A, ediff-even-diff-face-B)
+	(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
+	(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
+	(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
+	Use min-colors.
+
 	* term.el (term-down): Perform vertical motion if DOWN is negative.
 	(term-exec-1): Set both TERMCAP and TERMINFO
 	unconditionally.