Mercurial > hg > easyhg-kdiff3

annotate kdiff3/src-QT4/xpm/startmerge.xpm @ 113:7bca1f1340f6 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents 08ea9b86c12c
children
rev   line source
joachim99@8 1 /* XPM */
joachim99@8 2 static const char *startmerge[]={
joachim99@8 3 "16 16 6 1",
joachim99@8 4 ". c None",
joachim99@8 5 "# c #000000",
joachim99@8 6 "b c #0000ff",
joachim99@8 7 "c c #00ffff",
joachim99@8 8 "d c #ff0000",
joachim99@8 9 "a c #ffff00",
joachim99@8 10 ".......##.......",
joachim99@8 11 "......#aa#......",
joachim99@8 12 "......#aa#......",
joachim99@8 13 "...b.b.##.b.b...",
joachim99@8 14 "...bb......bb...",
joachim99@8 15 "...bbb....bbb...",
joachim99@8 16 ".##..........##.",
joachim99@8 17 "#cc#........#cc#",
joachim99@8 18 "#cc#........#cc#",
joachim99@8 19 ".##.b.b..b.b.##.",
joachim99@8 20 ".....bb..bb.....",
joachim99@8 21 "....bbb..bbb....",
joachim99@8 22 ".......##.......",
joachim99@8 23 "......#dd#......",
joachim99@8 24 "......#dd#......",
joachim99@8 25 ".......##......."};