Mercurial > emacs
diff lisp/ChangeLog @ 67501:d25e579a6232
*** empty log message ***
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Sun, 11 Dec 2005 10:47:41 +0000 |
parents | ab8e9c62b630 |
children | b13350468f6c |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 11 09:57:08 2005 +0000 +++ b/lisp/ChangeLog Sun Dec 11 10:47:41 2005 +0000 @@ -67,7 +67,6 @@ * 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