diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c506d82283..06ec64917ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | * emacs/octave-mod.el (octave-electric-space): Don't indent | 67 | * emacs/octave-mod.el (octave-electric-space): Don't indent |
| 68 | comments or strings if octave-auto-indent is nil. | 68 | comments or strings if octave-auto-indent is nil. |
| 69 | 69 | ||
| 70 | >>>>>>> 1.8782 | ||
| 71 | 2005-12-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 70 | 2005-12-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 72 | 71 | ||
| 73 | * term/mac-win.el: Require url when compiling. Call | 72 | * term/mac-win.el: Require url when compiling. Call |