Mercurial > emacs
view lisp/sb-dir-minus.xpm @ 89970:a849e5779b8c
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35
Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 05 Sep 2004 01:53:47 +0000 |
| parents | c2a09ac7b7b1 |
| children |
line wrap: on
line source
/* XPM */ static char * sb_dir_minus_xpm[] = { "20 15 5 1", " c None", ". c #B8B8B8", "+ c #000000", "@ c #FFF993", "# c #828282", " ...... ", " .++++++. ", ".+@@@@@@+......... ", ".+@@@@@@@+++++++++. ", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@+++++@@@@@@+#", ".+@@@@@@.....@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", ".+@@@@@@@@@@@@@@@@+#", " #++++++++++++++++# ", " ################ "};