diff options
| author | Per Abrahamsen | 2002-02-07 17:33:40 +0000 |
|---|---|---|
| committer | Per Abrahamsen | 2002-02-07 17:33:40 +0000 |
| commit | 8ff1bc942d9736d25e26e16794372c3d26033bc8 (patch) | |
| tree | 14287a5919b72d97ab484f638e411f5ca476d841 | |
| parent | 414fd7021adab560b064bdb55e156527b3c698ed (diff) | |
| download | emacs-8ff1bc942d9736d25e26e16794372c3d26033bc8.tar.gz emacs-8ff1bc942d9736d25e26e16794372c3d26033bc8.zip | |
fix conflict
| -rw-r--r-- | lisp/ChangeLog | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 468c08704ea..5460711b9f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | 2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk> | ||
| 2 | |||
| 3 | * cus-edit.el (customize-mark-to-save): New function. | ||
| 4 | * menu-bar.el (menu-bar-options-save): Rewrote. | ||
| 5 | |||
| 6 | 2002-02-06 Kim F. Storm <storm@cua.dk> | 1 | 2002-02-06 Kim F. Storm <storm@cua.dk> |
| 7 | 2 | ||
| 8 | * help.el (where-is): Report remapped commands. | 3 | * help.el (where-is): Report remapped commands. |
| @@ -89,7 +84,11 @@ | |||
| 89 | * gud.el (gud-refresh): Call recenter only after we are sure we | 84 | * gud.el (gud-refresh): Call recenter only after we are sure we |
| 90 | are in the right window. | 85 | are in the right window. |
| 91 | 86 | ||
| 92 | >>>>>>> 1.3415 | 87 | 2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk> |
| 88 | |||
| 89 | * cus-edit.el (customize-mark-to-save): New function. | ||
| 90 | * menu-bar.el (menu-bar-options-save): Rewrote. | ||
| 91 | |||
| 93 | 2002-02-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 92 | 2002-02-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> |
| 94 | 93 | ||
| 95 | * cus-start.el (x-use-underline-position-properties): | 94 | * cus-start.el (x-use-underline-position-properties): |