Mercurial > hg > xemacs-beta
view etc/toolbar/replace-xx.xpm @ 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 | 376386a54a3c |
children | 7910031dd78a |
line wrap: on
line source
/* XPM */ static char * replace[] = { "28 28 2 1", "X c Gray75 s backgroundToolBarColor", "o c Gray60", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXooXXXXooooXXXXXXXXXXXX", "XXXXXXooXXXXooXXoXXXXXXXXXXX", "XXXXXoXooXXXooXXoXXXXXXXXXXX", "XXXXXoXooXXXoooooXXXXXXXXXXX", "XXXXoXXXooXXooXXXoXXoooXXXXX", "XXXXooooooXXooXXXoXXooXXXXXX", "XXXoXXXXXooXooXXXoXXoXoXXXXX", "XXXoXXXXXooXoooooXXXXXXoXXXX", "XXXXXXXXXXXXXXXXXXXXXXXoXXXX", "XXXXXXXXXXXXoXXXXXXXXXXoXXXX", "XXXXXXXXXXXoXXXXXXXXXXXoXXXX", "XXXXXXXXXXXoXXXXXXXXXXoXXXXX", "XXXXXXXXXXoXXXXXXXXXXoXXXXXX", "XXXXXXXXXoXXXXXXXXXXXXXXXXXX", "XXXXXXXXXoXXXXXXooooXXXXXXXX", "XXXXXXXXoXXXXXXooXXXoXXXXXXX", "XXXXXoXoXXXXXXXooXXXXXXXXXXX", "XXXXXooXXXXXXXXooXXXXXXXXXXX", "XXXXXooooXXXXXXooXXXXXXXXXXX", "XXXXXooXXXXXXXXooXXXXXXXXXXX", "XXXXXXXXXXXXXXXooXXXoXXXXXXX", "XXXXXXXXXXXXXXXXooooXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"};