Mercurial > emacs
changeset 43168:3d510ec26d69
fix conflict
| author | Per Abrahamsen <abraham@dina.kvl.dk> |
|---|---|
| date | Thu, 07 Feb 2002 17:33:40 +0000 |
| parents | 6dab4dad0093 |
| children | 717543e790e1 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Feb 07 17:32:18 2002 +0000 +++ b/lisp/ChangeLog Thu Feb 07 17:33:40 2002 +0000 @@ -1,8 +1,3 @@ -2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk> - - * cus-edit.el (customize-mark-to-save): New function. - * menu-bar.el (menu-bar-options-save): Rewrote. - 2002-02-06 Kim F. Storm <storm@cua.dk> * help.el (where-is): Report remapped commands. @@ -89,7 +84,11 @@ * gud.el (gud-refresh): Call recenter only after we are sure we are in the right window. ->>>>>>> 1.3415 +2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk> + + * cus-edit.el (customize-mark-to-save): New function. + * menu-bar.el (menu-bar-options-save): Rewrote. + 2002-02-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> * cus-start.el (x-use-underline-position-properties):