# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 979303130 0
# Node ID be492f742a75fe8e612f470e794e7e37f26e94f5
# Parent  ba1f849f938185a03907e7095b3747c56debef66
*** empty log message ***

diff -r ba1f849f9381 -r be492f742a75 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 12 12:38:21 2001 +0000
+++ b/lisp/ChangeLog	Fri Jan 12 12:38:50 2001 +0000
@@ -1,3 +1,7 @@
+2001-01-12  Gerd Moellmann  <gerd@gnu.org>
+
+	* calendar/calendar.el (calendar-basic-setup): Doc fix.
+
 2001-01-12  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule-cmds.el (prefer-coding-system): Fix
diff -r ba1f849f9381 -r be492f742a75 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 12 12:38:21 2001 +0000
+++ b/src/ChangeLog	Fri Jan 12 12:38:50 2001 +0000
@@ -1,5 +1,7 @@
 2001-01-12  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c (x_set_mouse_color): Fix color allocation.
+
 	* keyboard.c: Call get_local_map with new argument list.
 
 	* intervals.c (get_local_map): Change TYPE to Lisp_Object.