# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 971938713 0
# Node ID 7e334ab6c0a5225f832a1540aa05a0c68ff1841b
# Parent  ff0a7d57dede5a00dbc8bd7ad1e2e44997272b13
*** empty log message ***

diff -r ff0a7d57dede -r 7e334ab6c0a5 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 19 06:58:08 2000 +0000
+++ b/lisp/ChangeLog	Thu Oct 19 06:58:33 2000 +0000
@@ -18,7 +18,6 @@
 	(comint-mode-map): Add it to the menu.
 	Bind `C-c C-s' to comint-write-output.
 
->>>>>>> 1.1299
 2000-10-18  Gerd Moellmann  <gerd@gnu.org>
 
 	* startup.el (fancy-splash-screens): Set buffer-undo-list to t.
diff -r ff0a7d57dede -r 7e334ab6c0a5 src/ChangeLog
--- a/src/ChangeLog	Thu Oct 19 06:58:08 2000 +0000
+++ b/src/ChangeLog	Thu Oct 19 06:58:33 2000 +0000
@@ -1,3 +1,7 @@
+2000-10-19  Kenichi Handa  <handa@etl.go.jp>
+
+	* xterm.c (x_find_ccl_program): Check also fontp->full_name.
+
 2000-10-18  Gerd Moellmann  <gerd@gnu.org>
 
 	* strftime.c: Sync with glibc, file version 1.78.