Mercurial > emacs
diff leim/ChangeLog @ 83659:b2a46adb61f1
More fixes for 2007-08-21 merge conflict.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Fri, 24 Aug 2007 22:18:04 +0000 |
parents | b98604865ea0 |
children | 6b081e079821 f55f9811f5d7 |
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Fri, 24 Aug 2007 22:18:04 +0000 |
parents | b98604865ea0 |
children | 6b081e079821 f55f9811f5d7 |