From: Glenn Morris Date: Thu, 3 Mar 2011 08:13:09 +0000 (-0800) Subject: Merge fix. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~59 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4cabe815399447dfeb9a4b3304fc4fd225115a67;p=emacs.git Merge fix. --- diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 68d957584c6..5f0908e11c6 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,14 +1,3 @@ -2011-02-28 Juanma Barranquero - - * org.el (org-maybe-keyword-time-regexp): - * org-icalendar.el (org-icalendar-store-UID): - * org-agenda.el (org-agenda-scheduled-leaders) - (org-agenda-deadline-leaders, org-agenda-filter-preset): - * org-table.el (org-table-current-line-types) - (org-table-current-begin-line, org-table-current-begin-pos): - (org-table-current-field-formula): - Fix typos in docstrings. - 2011-02-10 Stefan Monnier * org-remember.el (org-remember-mode-map):