aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-03-03 00:13:09 -0800
committerGlenn Morris2011-03-03 00:13:09 -0800
commit4cabe815399447dfeb9a4b3304fc4fd225115a67 (patch)
treed6ae262295ec1aa8b50b249d342a25b774fdca43
parent06083aa12dafb69752c0f1a0d355877dbd32a81f (diff)
downloademacs-4cabe815399447dfeb9a4b3304fc4fd225115a67.tar.gz
emacs-4cabe815399447dfeb9a4b3304fc4fd225115a67.zip
Merge fix.
-rw-r--r--lisp/org/ChangeLog11
1 files changed, 0 insertions, 11 deletions
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 @@
12011-02-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * org.el (org-maybe-keyword-time-regexp):
4 * org-icalendar.el (org-icalendar-store-UID):
5 * org-agenda.el (org-agenda-scheduled-leaders)
6 (org-agenda-deadline-leaders, org-agenda-filter-preset):
7 * org-table.el (org-table-current-line-types)
8 (org-table-current-begin-line, org-table-current-begin-pos):
9 (org-table-current-field-formula):
10 Fix typos in docstrings.
11
122011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 12011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
13 2
14 * org-remember.el (org-remember-mode-map): 3 * org-remember.el (org-remember-mode-map):