aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-03-11 12:33:37 +0000
committerEli Zaretskii2006-03-11 12:33:37 +0000
commit306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f (patch)
treecc233e44d27998d15211fdd05372401b5733c8a8
parent8890220d927ff4c24530dc47c8b3df433e2c9432 (diff)
downloademacs-306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f.tar.gz
emacs-306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog2
-rw-r--r--src/ChangeLog5
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d05b8b83d0d..aa50978f5e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12006-03-11 Eli Zaretskii <eliz@gnu.org> 12006-03-11 Eli Zaretskii <eliz@gnu.org>
2 2
3 * calendar/holidays.el (list-holidays): Doc fix.
4
3 * international/mule.el (auto-coding-alist): Add .odt 5 * international/mule.el (auto-coding-alist): Add .odt
4 (OpenOffice's open document) files. 6 (OpenOffice's open document) files.
5 7
diff --git a/src/ChangeLog b/src/ChangeLog
index 99e8ab7cb44..b66d8bbf58b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-03-11 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
2
3 * lisp.h: Remove duplicate prototypes. Make the prototype of
4 getloadavg be conditioned on HAVE_GETLOADAVG being undefined.
5
12006-03-11 Eli Zaretskii <eliz@gnu.org> 62006-03-11 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last 8 * xterm.c (x_draw_hollow_cursor): Subtract 1 from the last