# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142080417 0
# Node ID 2866b9064bb9dd32ac38a5c165fbadc42f1e6ce9
# Parent  c65249b41906113a9f2f06c8d028205387a53b5b
*** empty log message ***

diff -r c65249b41906 -r 2866b9064bb9 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 11 12:33:03 2006 +0000
+++ b/lisp/ChangeLog	Sat Mar 11 12:33:37 2006 +0000
@@ -1,5 +1,7 @@
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
+	* calendar/holidays.el (list-holidays): Doc fix.
+
 	* international/mule.el (auto-coding-alist): Add .odt
 	(OpenOffice's open document) files.
 
diff -r c65249b41906 -r 2866b9064bb9 src/ChangeLog
--- a/src/ChangeLog	Sat Mar 11 12:33:03 2006 +0000
+++ b/src/ChangeLog	Sat Mar 11 12:33:37 2006 +0000
@@ -1,3 +1,8 @@
+2006-03-11  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* lisp.h: Remove duplicate prototypes.  Make the prototype of
+	getloadavg be conditioned on HAVE_GETLOADAVG being undefined.
+
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
 	* xterm.c (x_draw_hollow_cursor): Subtract 1 from the last