# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1166200591 0
# Node ID 371b10f69bf4e09fdcde7863188b0dff5f1e11c9
# Parent  ee3e5cf45b698391b6bde46a724a85def7d0b5b4
*** empty log message ***

diff -r ee3e5cf45b69 -r 371b10f69bf4 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 15 16:35:43 2006 +0000
+++ b/lisp/ChangeLog	Fri Dec 15 16:36:31 2006 +0000
@@ -1,3 +1,15 @@
+2006-12-15  Kevin Gallagher <Kevin.Gallagher@boeing.com>
+
+	* emulation/edt.el (edt-xserver): 
+	* emulation/edt-mapper.el (edt-xserver): Replace `/' with a `-',
+	to fix a problem on Cygwin.
+
+	* emulation/edt.el
+	* emulation/edt-mapper.el
+	* emulation/edt-lk201.el
+	* emulation/edt-pc.el
+	* emulation/edt-vt100.el: Update maintainer's email address.
+
 2006-12-15  Simon Marshall  <simon@gnu.org>
 
 	* progmodes/cc-fonts.el (c-font-lock-declarations): Fix previous
diff -r ee3e5cf45b69 -r 371b10f69bf4 src/ChangeLog
--- a/src/ChangeLog	Fri Dec 15 16:35:43 2006 +0000
+++ b/src/ChangeLog	Fri Dec 15 16:36:31 2006 +0000
@@ -1,3 +1,7 @@
+2006-12-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs.c (USAGE3): Clarify documentation of --color.
+
 2006-12-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: New