Mercurial > hg > easyhg-kdiff3
view kdiff3/src-QT4/xpm/startmerge.xpm @ 95:6f42f5bd218e
- OS2-port by Silvan Scherrer
- Fixed writing to KIO.
- Fix crash on A/B-overview (infinite recursion)
| author | joachim99 |
|---|---|
| date | Sun, 28 Feb 2010 20:32:34 +0000 |
| parents | 08ea9b86c12c |
| children |
line wrap: on
line source
/* XPM */ static const char *startmerge[]={ "16 16 6 1", ". c None", "# c #000000", "b c #0000ff", "c c #00ffff", "d c #ff0000", "a c #ffff00", ".......##.......", "......#aa#......", "......#aa#......", "...b.b.##.b.b...", "...bb......bb...", "...bbb....bbb...", ".##..........##.", "#cc#........#cc#", "#cc#........#cc#", ".##.b.b..b.b.##.", ".....bb..bb.....", "....bbb..bbb....", ".......##.......", "......#dd#......", "......#dd#......", ".......##......."};