More icon changes

git-svn-id: http://svn.dmdirc.com/trunk@2444 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/res/input-error.svg

@@ -57,7 +57,11 @@
      inkscape:groupmode="layer">
     <path
        sodipodi:type="arc"
+<<<<<<< .mine
+       style="fill:#d40000;stroke:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
+=======
        style="fill:#d40000;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
+>>>>>>> .r2443
        id="path2168"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"
@@ -67,7 +71,11 @@
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048888)" />
     <path
        sodipodi:type="arc"
+<<<<<<< .mine
+       style="fill:#b60000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
+=======
        style="fill:#800000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
+>>>>>>> .r2443
        id="path4116"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"
@@ -76,9 +84,26 @@
        d="M 15.046535,8.0712872 A 6.9826732,6.9826732 0 0 1 3.1870561,13.068736 L 8.0638618,8.0712872 z"
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048882)"
        sodipodi:start="0"
-       sodipodi:end="2.3439772" />
+       sodipodi:end="2.3439772"
+       inkscape:transform-center-x="2.1173267"
+       inkscape:transform-center-y="-2.0722772" />
     <path
        sodipodi:type="arc"
+<<<<<<< .mine
+       style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path7212"
+       sodipodi:cx="8.0638618"
+       sodipodi:cy="8.0712872"
+       sodipodi:rx="6.9826732"
+       sodipodi:ry="6.9826732"
+       d="M 1.1056779,8.6555825 A 6.9826732,6.9826732 0 0 1 11.764117,2.1496458 L 8.0638618,8.0712872 z"
+       transform="matrix(0.9600389,0,0,0.9600389,0.2574227,0.2142829)"
+       sodipodi:start="3.0578168"
+       sodipodi:end="5.2708947" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
+=======
        style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
        id="path7212"
        sodipodi:cx="8.0638618"
@@ -92,6 +117,7 @@
     <path
        sodipodi:type="arc"
        style="fill:none;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
+>>>>>>> .r2443
        id="path4118"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"