*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bfba1b26f53faa28f9a4165d3e234d51ae176ee..f93539c416c44b35b19688add436c28e4b6582cc 100644 (file)
--- 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 12e78923f9ed37a16c3f117794ea5cbab382ee37..785ba4318e1d3dfd727559dbb99ada9b2a9374f2 100644 (file)
--- 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