From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Mar 2006 12:33:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3701
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d05b8b83d0d..aa50978f5e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 99e8ab7cb44..b66d8bbf58b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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