diff lisp/org/ChangeLog @ 109418:6e96aca307a4

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 27 Jun 2010 22:48:36 +0000
parents 446dbaf86e72
children a150e8a14679
line wrap: on
line diff
--- a/lisp/org/ChangeLog	Fri Jun 25 03:34:29 2010 +0000
+++ b/lisp/org/ChangeLog	Sun Jun 27 22:48:36 2010 +0000
@@ -1,3 +1,13 @@
+2010-06-26  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete
+	variables.
+
+	* org.el (calendar): Require calendar now on top level in org.el
+	and define aliases to new variables when needed.
+	(org-read-date, org-goto-calendar): Do not bind obsolete
+	variables.
+
 2010-06-22  Glenn Morris  <rgm@gnu.org>
 
 	* org-entities.el: Add explicit utf-8 coding cookie to file with