*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1cef0ec4d1dcb30dd7e626d8ecc74348ebaf9e69..57c5a369037799dd1d5ca1275697014b1fc6deb5 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-13  Carsten Dominik  <dominik@science.uva.nl>
+
+       * orgcard.tex: Version number change.
+
 2006-11-13  Bill Wohler  <wohler@newt.com>
 
        Release MH-E version 8.0.3.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59d72fea53f11648f98adbdb91c103873130c57b..ff2da0b32e9c0049fbf758fd675f77a58eb64e8b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-13  Carsten Dominik  <dominik@science.uva.nl>
+
+       * textmodes/org.el (org-metaleft): Call `org-outdent-item' on
+       bullets.
+       (org-metaright): Call `org-indent-item' on bullets.
+       (org-timestamp-change): Set `org-last-changed-timestamp'.
+       (org-current-line): Make sure (bolp) returns correct result.
+       (org-agenda-change-all-lines): Make sure highlighting TODO always
+       works.
+
 2006-11-12  Richard Stallman  <rms@gnu.org>
 
        * language/european.el (turkish-case-conversion-enable)
@@ -142,9 +152,21 @@
 
 2006-11-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
+<<<<<<< ChangeLog
+       * textmodes/org.el (org-show-hierarchy-above) 
+       (org-show-following-heading): Fixed typo in default value.
+
+2006-11-10  Carsten Dominik  <carsten.dominik@gmail.com>
+
+       * textmodes/org.el (org-scan-tags): Make the search
+       case-sensitive.
+       (org-tags-sparse-tree): Don't overrule
+       `org-show-following-heading' and `org-show-hierarchy-above'.
+=======
        * textmodes/org.el (org-scan-tags): Make the search case-sensitive.
        (org-tags-sparse-tree): Don't overrule `org-show-following-heading'
        and `org-show-hierarchy-above'.
+>>>>>>> 1.10303
        (org-reveal): New command.
        (org-show-context): Renamed from `org-show-hierarchy-above'.
        (org-fast-tag-selection-single-key): New option.

diff --git a/man/ChangeLog b/man/ChangeLog
index f27910e7c789a821a6385c7bf1dbbc5f536b561d..f04e220e081605d2831f3252cf6f15e24face70b 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-13  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org.texi: Minor typo fixes.
+
 2006-11-13  Bill Wohler  <wohler@newt.com>
 
        Release MH-E manual version 8.0.3.