Mercurial > emacs

changeset 69375:2866b9064bb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Eli Zaretskii <eliz@gnu.org>
date Sat, 11 Mar 2006 12:33:37 +0000
parents c65249b41906
children 921341a03d5b
files lisp/ChangeLog src/ChangeLog
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
 
--- 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