Mercurial > emacs
comparison lisp/scroll-lock.el @ 111948:cbde616eefa5
ChangeLog merge fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 13 Dec 2010 09:24:04 -0800 (2010-12-13) |
| parents | 1d1d5d9bd884 |
| children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 111947:00848c75219e | 111948:cbde616eefa5 |
|---|