# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1116588465 0
# Node ID 5e481e5664d32326876e90af90727d9abb7a46fd
# Parent  153ddc124932f56835a8feb8d8192588a09ee765
*** empty log message ***

diff -r 153ddc124932 -r 5e481e5664d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 20 11:24:48 2005 +0000
+++ b/lisp/ChangeLog	Fri May 20 11:27:45 2005 +0000
@@ -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 -r 153ddc124932 -r 5e481e5664d3 man/ChangeLog
--- a/man/ChangeLog	Fri May 20 11:24:48 2005 +0000
+++ b/man/ChangeLog	Fri May 20 11:27:45 2005 +0000
@@ -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.