From: Gerd Moellmann <gerd@gnu.org>
Date: Sun, 18 Jun 2000 00:08:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3268
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9021acd11febf7d44b2a7a2cc7878b8371a1531;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80afd633151..8803b3d2226 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,6 +10,10 @@
 
 	* time.el: Remove trailing ^M that prevent CVS-merging.
 
+2000-06-16  Gerd Moellmann  <gerd@gnu.org>
+
+	* Makefile.in (distclean): New target.
+	
 2000-06-16  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* Makefile.in (srcdir): Define for update-subdirs.
diff --git a/src/ChangeLog b/src/ChangeLog
index fde27d1fbe3..292eefd05ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,9 @@
 
 2000-06-16  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (syms_of_xfaces) [DEBUG_X_COLORS]: Defsubr dump_colors
+	only if HAVE_X_WINDOWS.
+
 	* keymap.c (describe_buffer_bindings): Add `\f\n' in front
 	of titles.