Mercurial > hg > easyhg-kdiff3
view kdiff3/src-QT4/xpm/startmerge.xpm @ 98:236f1c9c3fbf
- Fixed redundant empty line in history merge.
- Fixed inconsistency in directory view info area after scan.
- Fixed crash if trying to disable "Dir & Text Split Screen View" and no
file is loaded.
- Fixed test dialog for regular expressions.
author | joachim99 |
---|---|
date | Sat, 15 May 2010 20:36:52 +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#......", ".......##......."};