*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d962d71c0441d380d6ba95afb63c73221771ae92..8c7da4e15bd30af9f1c9dd0b5b138b88e3f41522 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
+
+       * textmodes/org.el (org-agenda-toggle-time-grid): New command.
+       (org-agenda-use-time-grid, org-agenda-time-grid): New options.
+       (org-agenda-add-time-grid-maybe): New function.
+       (org-agenda): Call `org-agenda-add-time-grid-maybe'.
+       (org-table-create): `dotimes' instead of `mapcar'.
+       (org-xor): Simplified implementation.
+       (org-agenda): `inhibit-redisplay' turned on.
+       (org-agenda-change-all-lines): Use `org-format-agenda-item' to get
+       a consistent line after a state change.
+       (org-agenda-remove-times-when-in-prefix): New option.
+       (org-prefix-has-time): New variable.
+       (org-parse-time-string): Optional argument NODEFAULT.
+       (org-format-agenda-item): Parse items for time-of-day
+       specifications and move these into the prefix if possible.
+       (org-agenda-priority): Get current heading, not previous heading
+       during agenda remote editing.
+
 2005-05-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * subr.el (send-string, send-region):

diff --git a/man/ChangeLog b/man/ChangeLog
index acde7c5b4915769c1ae4235b0bc930c4465669b0..077d393f521d6f900de1aecb55eaae6e29ffe3f8 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-20  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org.texi: Version 3.09
+
+<<<<<<< ChangeLog
+2005-05-18  Carsten Dominik  <dominik@science.uva.nl>
+
+       * reftex.texi: Version 4.28
+
+=======
 2005-05-18  Luc Teirlinck  <teirllm@auburn.edu>
 
        * buffers.texi (Select Buffer): Document `C-u M-g M-g'.
@@ -114,6 +124,7 @@
 
        * building.texi (Debugger Operation): Clarify previous change.
 
+>>>>>>> 1.574
 2005-04-29  Carsten Dominik  <dominik@science.uva.nl>
 
        * org.texi: Version 3.08, structure reorganized.