Mercurial > hg > xemacs-beta
view nt/Xmd.patch @ 2146:e4307a6b9ebb
[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 | a86b2b5e0111 |
children |
line wrap: on
line source
--- Xmd.h~ Thu Jun 08 23:20:40 1995 +++ Xmd.h Sun Mar 16 13:09:10 1997 @@ -150,8 +150,9 @@ typedef CARD16 BITS16; typedef CARD8 BYTE; +#ifndef WIN32 typedef CARD8 BOOL; - +#endif