Mercurial > hg > xemacs-beta
view etc/toolbar/paste-cap-up.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 | 3ecd8885ac67 |
| children | 7910031dd78a |
line wrap: on
line source
/* XPM */ static char * paste[] = { "33 33 6 1", "X c Gray75 s backgroundToolBarColor", "u c #000000000000 s foregroundToolBarColor", "o c black", "O c Gray90", "+ c Gray60", "@ c white", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXooXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXoOOoXXXXXXXXXXXXXXX", "XXXXXXXXooooooOooOooooooXXXXXXXXX", "XXXXXXXo++++oOOOOOOo++++oXXXXXXXX", "XXXXXXXo+++oooooooooo+++oXXXXXXXX", "XXXXXXXo++++++++++++++++oXXXXXXXX", "XXXXXXXo++++++++++++++++oXXXXXXXX", "XXXXXXXo++++++++++++++++oXXXXXXXX", "XXXXXXXo++++++++++++++++oXXXXXXXX", "XXXXXXXo++++++oooooooooooXXXXXXXX", "XXXXXXXo++++++o@@@@@@@@ooXXXXXXXX", "XXXXXXXo++++++o@@@@@@@@o+oXXXXXXX", "XXXXXXXo++++++o@oooooo@ooooXXXXXX", "XXXXXXXo++++++o@@@@@@@@@@@oXXXXXX", "XXXXXXXo++++++o@oooo@@@@@@oXXXXXX", "XXXXXXXo++++++o@@@@@@@@@@@oXXXXXX", "XXXXXXXo++++++o@@@@@@@@@@@oXXXXXX", "XXXXXXXo++++++o@oooooooo@@oXXXXXX", "XXXXXXXoooooooo@@@@@@@@@@@oXXXXXX", "XXXXXXXXXXXXXXo@@@@@@@@@@@oXXXXXX", "XXXXXXXXXXXXXXo@@@@@@@@@@@oXXXXXX", "XXXXXXXXXXXXXXoooooooooooooXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXuXXXXXXXXXXX", "XXXXXXXuuuXXXXXXXXXXXuXXXXXXXXXXX", "XXXXXXXuXXuXuuXXXuuXuuuXuXXXXXXXX", "XXXXXXXuXXuXXXuXuXXXXuXuXuXXXXXXX", "XXXXXXXuuuXXuuuXXuuXXuXuuuXXXXXXX", "XXXXXXXuXXXXuXuXXXuXXuXuXXXXXXXXX", "XXXXXXXuXXXXuuXuuuXXXuXXuuXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};