Mercurial > emacs
changeset 91722:91863446e5d0
Remove bogus merge relicts from previous commit.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sun, 10 Feb 2008 14:08:03 +0000 |
| parents | 558041859d55 |
| children | bb158f0053d9 |
| files | admin/FOR-RELEASE |
| diffstat | 1 files changed, 0 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/FOR-RELEASE Sun Feb 10 14:01:52 2008 +0000 +++ b/admin/FOR-RELEASE Sun Feb 10 14:08:03 2008 +0000 @@ -94,26 +94,6 @@ ** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround -<<<<<<< FOR-RELEASE -<<<<<<< FOR-RELEASE -** Get rid of old-style backquotes in cc-vars.el. -ttn has a patch: -http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html - -** Fix or document the shortcoming of easymenu and :suffix. -http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html - -** tool bar icons disappear [in customize buffers] -http://thread.gmane.org/gmane.emacs.devel/84869 - -======= ->>>>>>> 1.738 -** Fix problem with mode-name in SGML mode. -If mode-name stays non-string, add NEWS entry and doc fix. -http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html - -======= ->>>>>>> 1.748 ** multi-tty does not work correctly. If the server is started from a tty frame and emacsclient creates an X11 frame, the tty frame gets confused, it thinks it is an X11 frame