Commit 8ff1bc94 authored by Per Abrahamsen's avatar Per Abrahamsen

fix conflict

parent 414fd702
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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment