Procházet zdrojové kódy

More icon changes


git-svn-id: http://svn.dmdirc.com/trunk@2444 00569f92-eb28-0410-84fd-f71c24880f
tags/0.5.5
Chris Smith před 16 roky
rodič
revize
be29704b42
2 změnil soubory, kde provedl 27 přidání a 1 odebrání
  1. binární
      src/com/dmdirc/res/input-error.png
  2. 27
    1
      src/com/dmdirc/res/input-error.svg

binární
src/com/dmdirc/res/input-error.png Zobrazit soubor


+ 27
- 1
src/com/dmdirc/res/input-error.svg Zobrazit soubor

57
      inkscape:groupmode="layer">
57
      inkscape:groupmode="layer">
58
     <path
58
     <path
59
        sodipodi:type="arc"
59
        sodipodi:type="arc"
60
+<<<<<<< .mine
61
+       style="fill:#d40000;stroke:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
62
+=======
60
        style="fill:#d40000;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
63
        style="fill:#d40000;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
64
+>>>>>>> .r2443
61
        id="path2168"
65
        id="path2168"
62
        sodipodi:cx="8.0638618"
66
        sodipodi:cx="8.0638618"
63
        sodipodi:cy="8.0712872"
67
        sodipodi:cy="8.0712872"
67
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048888)" />
71
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048888)" />
68
     <path
72
     <path
69
        sodipodi:type="arc"
73
        sodipodi:type="arc"
74
+<<<<<<< .mine
75
+       style="fill:#b60000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
76
+=======
70
        style="fill:#800000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
77
        style="fill:#800000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
78
+>>>>>>> .r2443
71
        id="path4116"
79
        id="path4116"
72
        sodipodi:cx="8.0638618"
80
        sodipodi:cx="8.0638618"
73
        sodipodi:cy="8.0712872"
81
        sodipodi:cy="8.0712872"
76
        d="M 15.046535,8.0712872 A 6.9826732,6.9826732 0 0 1 3.1870561,13.068736 L 8.0638618,8.0712872 z"
84
        d="M 15.046535,8.0712872 A 6.9826732,6.9826732 0 0 1 3.1870561,13.068736 L 8.0638618,8.0712872 z"
77
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048882)"
85
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048882)"
78
        sodipodi:start="0"
86
        sodipodi:start="0"
79
-       sodipodi:end="2.3439772" />
87
+       sodipodi:end="2.3439772"
88
+       inkscape:transform-center-x="2.1173267"
89
+       inkscape:transform-center-y="-2.0722772" />
80
     <path
90
     <path
81
        sodipodi:type="arc"
91
        sodipodi:type="arc"
92
+<<<<<<< .mine
93
+       style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
94
+       id="path7212"
95
+       sodipodi:cx="8.0638618"
96
+       sodipodi:cy="8.0712872"
97
+       sodipodi:rx="6.9826732"
98
+       sodipodi:ry="6.9826732"
99
+       d="M 1.1056779,8.6555825 A 6.9826732,6.9826732 0 0 1 11.764117,2.1496458 L 8.0638618,8.0712872 z"
100
+       transform="matrix(0.9600389,0,0,0.9600389,0.2574227,0.2142829)"
101
+       sodipodi:start="3.0578168"
102
+       sodipodi:end="5.2708947" />
103
+    <path
104
+       sodipodi:type="arc"
105
+       style="fill:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
106
+=======
82
        style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
107
        style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
83
        id="path7212"
108
        id="path7212"
84
        sodipodi:cx="8.0638618"
109
        sodipodi:cx="8.0638618"
92
     <path
117
     <path
93
        sodipodi:type="arc"
118
        sodipodi:type="arc"
94
        style="fill:none;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
119
        style="fill:none;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
120
+>>>>>>> .r2443
95
        id="path4118"
121
        id="path4118"
96
        sodipodi:cx="8.0638618"
122
        sodipodi:cx="8.0638618"
97
        sodipodi:cy="8.0712872"
123
        sodipodi:cy="8.0712872"

Načítá se…
Zrušit
Uložit