*** empty log message ***

2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 377f2ce0fc2..6c506d82283 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-11  Richard M. Stallman  <rms@gnu.org>
+
+        * buff-menu.el (Buffer-menu-sort-column): Not a user variable.
+
 2005-12-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el: Create keymap for mac-apple-event-map.
@@ -63,6 +67,7 @@
         * emacs/octave-mod.el (octave-electric-space): Don't indent
         comments or strings if octave-auto-indent is nil.
 
+>>>>>>> 1.8782
 2005-12-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el: Require url when compiling.  Call
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index a1e236c3314..815dc348383 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-10  Richard M. Stallman  <rms@gnu.org>
+
+        * customize.texi (Common Keywords): State caveats for use of :tag.
+
 2005-12-08  Richard M. Stallman  <rms@gnu.org>
 
         * minibuf.texi (Intro to Minibuffers): Replace list of local maps