From 75036d1c402448af9500c44f3d3d0ea73cf70a95 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 15 Dec 2006 16:36:31 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 12 ++++++++++++
 src/ChangeLog  |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bfba1b26f..f93539c416 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 12e78923f9..785ba4318e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
-- 
2.39.2