diff options
| author | Romain Francoise | 2006-08-03 18:41:58 +0000 |
|---|---|---|
| committer | Romain Francoise | 2006-08-03 18:41:58 +0000 |
| commit | 8a38d42d83bb9fc54ce958ca6b791f7748e2f6d3 (patch) | |
| tree | 57a664665474f29bdf7bd464f3f2d79b43567bfa /lisp/ChangeLog | |
| parent | fa9398d09ea120de89f587bfba40453f7ef1a0a2 (diff) | |
| download | emacs-8a38d42d83bb9fc54ce958ca6b791f7748e2f6d3.tar.gz emacs-8a38d42d83bb9fc54ce958ca6b791f7748e2f6d3.zip | |
*** empty log message ***
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f6e469dd62..d00d8308c91 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -185,13 +185,8 @@ | |||
| 185 | 185 | ||
| 186 | * tumme.el (tumme-backward-image): Add prefix argument. Add error | 186 | * tumme.el (tumme-backward-image): Add prefix argument. Add error |
| 187 | when at first image. | 187 | when at first image. |
| 188 | <<<<<<< ChangeLog | ||
| 189 | (tumme-forward-image): Add prefix argument. | ||
| 190 | Add error when at last image. | ||
| 191 | ======= | ||
| 192 | (tumme-forward-image): Add prefix argument. Add error when at last | 188 | (tumme-forward-image): Add prefix argument. Add error when at last |
| 193 | image. | 189 | image. |
| 194 | >>>>>>> 1.9899 | ||
| 195 | 190 | ||
| 196 | 2006-07-25 Stefan Monnier <monnier@iro.umontreal.ca> | 191 | 2006-07-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 197 | 192 | ||