Mercurial > hg > xemacs-beta

comparison lisp/ChangeLog @ 2146:e4307a6b9ebb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-06-21 18:26:18 by adrian] [R21.4] [PATCH] xemacs-21.5: Fix false cvs conflict in lisp/package-ui.el -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2004-06-21 Adrian Aichner <adrian@xemacs.org> * package-ui.el (pui-help-echo): Fix false cvs conflict by avoiding line solely composed of equal signs.
author adrian
date Mon, 21 Jun 2004 18:26:18 +0000
parents eb65d362090f
children f33f1487208d
comparison
equal deleted inserted replaced
2145:f0cb4110f17e 2146:e4307a6b9ebb
1 2004-06-21 Adrian Aichner <adrian@xemacs.org>
2
3 * package-ui.el (pui-help-echo): Fix false cvs conflict by
4 avoiding line solely composed of equal signs.
5
1 2004-06-18 Jerry James <james@xemacs.org> 6 2004-06-18 Jerry James <james@xemacs.org>
2 7
3 * derived.el (define-derived-mode): Put the arguments to 8 * derived.el (define-derived-mode): Put the arguments to
4 derived-mode-merge-syntax-tables in the correct order. 9 derived-mode-merge-syntax-tables in the correct order.
5 10