Mercurial > hg > xemacs-beta
view src/xintrinsic.h @ 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 | abe6d1db359e |
children | 308d34e9f07d |
line wrap: on
line source
/* Front-end to Xt's Intrinsic.h. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_xintrinsic_h_ #define INCLUDED_xintrinsic_h_ #include <X11/Intrinsic.h> #endif /* INCLUDED_xintrinsic_h_ */