*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a00006574a9b3fce3bcacd423bd4010a8882a9f0..2959c69da423d17eb74123c9a4355fc868f7214e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2005-10-21  Carsten Dominik  <dominik@science.uva.nl>
+
+       * textmodes/org.el: (org-combined-agenda-icalendar-file)
+       (org-icalendar-include-todo, org-icalendar-combined-name): New
+       options.
+       (org-export-icalendar-this-file)
+       (org-export-icalendar-all-agenda-files)
+       (org-export-icalendar-combine-agenda-files): New commands.
+       (org-export-icalendar, org-print-icalendar-entries)
+       (org-start-icalendar-file, org-finish-icalendar-file)
+       (org-ical-ts-to-string): New functions.
+       (org-read-date, org-goto-calendar)
+       (org-agenda-goto-calendar): Inhibit displaying diary entries by
+       call to `calendar'.
+       (orgtbl-setup): Removed the :keys arguments from the menu
+       description.
+       (org-after-save-iCalendar-file-hook): New variable.
+
 2005-10-21  Kenichi Handa  <handa@m17n.org>
 
        * language/vietnamese.el (tcvn-5712): Make it an alias of

diff --git a/man/ChangeLog b/man/ChangeLog
index 5d009b3340d4a301d2260f4bbe37d42e997143d4..8e3e2188d1bac66bc4c3392bb0d0e91abdc3f71f 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-21  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org.texi (Summary): Mention iCalendar support.
+       (Exporting): Document iCalendar support.
+
 2005-10-18  Romain Francoise  <romain@orebokech.com>
 
        * files.texi (Version Systems): Capitalize GNU.