[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59750] branches/soc-2013-ui_replay/ release/datafiles: Resolved conflicts in icon file.
Vincent Akkermans
vincent at ack-err.net
Mon Sep 2 20:50:57 CEST 2013
Revision: 59750
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59750
Author: ack-err
Date: 2013-09-02 18:50:57 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Resolved conflicts in icon file.
Modified Paths:
--------------
branches/soc-2013-ui_replay/release/datafiles/blender_icons.svg
branches/soc-2013-ui_replay/release/datafiles/blender_icons16.png
branches/soc-2013-ui_replay/release/datafiles/blender_icons32.png
Modified: branches/soc-2013-ui_replay/release/datafiles/blender_icons.svg
===================================================================
--- branches/soc-2013-ui_replay/release/datafiles/blender_icons.svg 2013-09-02 18:33:06 UTC (rev 59749)
+++ branches/soc-2013-ui_replay/release/datafiles/blender_icons.svg 2013-09-02 18:50:57 UTC (rev 59750)
@@ -14,13 +14,9 @@
height="640"
id="svg2"
sodipodi:version="0.32"
-<<<<<<< .working
inkscape:version="0.48.2 r9819"
-=======
- inkscape:version="0.48.4 r9939"
->>>>>>> .merge-right.r59741
version="1.0"
- sodipodi:docname="blender_icons.svg"
+ sodipodi:docname="blender_icons_trunk.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
style="display:inline;enable-background:new"
inkscape:export-filename="blender_icons16.png"
@@ -31,39 +27,6 @@
<defs
id="defs4">
<linearGradient
- id="linearGradient17432">
- <stop
- style="stop-color:#ffc98e;stop-opacity:1;"
- offset="0"
- id="stop17435" />
- <stop
- style="stop-color:#855d02;stop-opacity:1;"
- offset="1"
- id="stop17437" />
- </linearGradient>
- <linearGradient
- id="linearGradient17420">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop17422" />
- <stop
- id="stop17428"
- offset="1"
- style="stop-color:#000000;stop-opacity:0.49803922;" />
- </linearGradient>
- <linearGradient
- id="linearGradient17405">
- <stop
- style="stop-color:#a5a5a5;stop-opacity:1;"
- offset="0"
- id="stop17407" />
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="1"
- id="stop17409" />
- </linearGradient>
- <linearGradient
inkscape:collect="always"
id="linearGradient18214">
<stop
@@ -26964,620 +26927,27252 @@
x2="80.53125"
y2="502"
gradientUnits="userSpaceOnUse" />
-<<<<<<< .working
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient319"
- id="linearGradient16032"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28981"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.8167109,0,0,0.8433415,239.34332,-149.78578)"
- x1="104.90227"
- y1="53.227627"
- x2="117.12428"
- y2="61.720783" />
+ gradientTransform="matrix(0.8422958,0,0,0.8364537,82.535678,2.9394266)"
+ x1="89.975014"
+ y1="-32.339718"
+ x2="88.492455"
+ y2="-33.303608" />
<linearGradient
+ id="linearGradient29761">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop29763" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop29765" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient319"
- id="linearGradient16034"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28983"
gradientUnits="userSpaceOnUse"
- x1="-56.5"
- y1="340.32199"
- x2="-56.5"
- y2="348" />
+ x1="131.02808"
+ y1="123.49161"
+ x2="128.7139"
+ y2="115.97001" />
<linearGradient
+ id="linearGradient67970">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop67972" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop67974" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient319"
- id="linearGradient16037"
+ xlink:href="#linearGradient29761"
+ id="linearGradient28985"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(0,13)"
- x1="-56.8125"
- y1="329.06256"
- x2="-47.214466"
- y2="329.26965" />
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118" />
<linearGradient
+ id="linearGradient67977">
+ <stop
+ style="stop-color:#b74125;stop-opacity:1;"
+ offset="0"
+ id="stop67979" />
+ <stop
+ style="stop-color:#f9fbff;stop-opacity:1"
+ offset="1"
+ id="stop67981" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient16500"
- id="linearGradient16040"
+ xlink:href="#linearGradient8864-1"
+ id="linearGradient28987"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-259,202)"
- x1="202.5"
- y1="143.84116"
- x2="202.5"
- y2="132.60213" />
+ x1="115.15884"
+ y1="88.476723"
+ x2="109.18613"
+ y2="82.308861" />
<linearGradient
+ id="linearGradient8864-1">
+ <stop
+ id="stop8866-0"
+ offset="0"
+ style="stop-color:#b43214;stop-opacity:1;" />
+ <stop
+ id="stop8868-1"
+ offset="1"
+ style="stop-color:#e86830;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient37542"
- id="linearGradient16053"
+ xlink:href="#linearGradient1610-8-8"
+ id="linearGradient28989"
gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(21,0)"
+ x1="101"
+ y1="84.25"
+ x2="97.75"
+ y2="81.5" />
+ <linearGradient
+ id="linearGradient1610-8-8">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop1611-7-7" />
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="1"
+ id="stop1612-4-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-77-0"
+ id="linearGradient28991"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(21,0)"
+ x1="87.44548"
+ y1="81.439644"
+ x2="96.592278"
+ y2="89.708977" />
+ <linearGradient
+ id="linearGradient319-77-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop320-9-0" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop321-31-9" />
+ </linearGradient>
+ <linearGradient
+ y2="60.125"
+ x2="117"
+ y1="53.875"
+ x1="107.96875"
+ gradientTransform="matrix(0.9993234,0,0,1.0050357,-171.92846,305.72314)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17699"
+ xlink:href="#linearGradient319-8"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="252.63284"
+ x2="-45.689278"
+ y1="252.69086"
+ x1="-4.9152389"
+ gradientTransform="matrix(-1.0041772,0,0,0.9688607,-81.584854,117.13687)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17697"
+ xlink:href="#linearGradient37542-02"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="175.87964"
+ x2="-28.432825"
+ y1="178.07901"
+ x1="-26.313976"
+ gradientTransform="matrix(0.8008385,0,0,0.8956408,542.96118,-186.23401)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17675"
+ xlink:href="#linearGradient16595-8"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="168.04703"
+ x2="105.85706"
+ y1="171.25618"
+ x1="108.71671"
+ gradientTransform="matrix(0.8008385,0,0,0.821004,432.60027,-164.5819)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17673"
+ xlink:href="#aigrd2-0"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="164.38229"
+ x2="437.05005"
+ y1="164.38229"
+ x1="428.49286"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17649"
+ xlink:href="#linearGradient17405"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="164.38229"
+ x2="437.05005"
+ y1="164.38229"
+ x1="428.49286"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17536"
+ xlink:href="#linearGradient17405"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.46477431,0,0,2.1263819,-26.966496,-678.3919)"
+ gradientUnits="userSpaceOnUse"
+ y2="145.03127"
+ x2="378.03125"
+ y1="145.03127"
+ x1="361.96875"
+ id="linearGradient17323"
+ xlink:href="#linearGradient18118-8-8-0"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="118.5"
+ x2="235"
+ y1="118.47696"
+ x1="227.57907"
+ gradientTransform="translate(19.97577,-6.0080883)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16412"
+ xlink:href="#linearGradient319-8"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="121"
+ x2="233.08319"
+ y1="110.37873"
+ x1="222.4996"
+ gradientTransform="translate(19.97577,-6.0080883)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16410"
+ xlink:href="#linearGradient37542-02"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="62.960247"
+ x2="50.371208"
+ y1="65.644958"
+ x1="52.17437"
+ gradientTransform="translate(0,-21)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16398"
+ xlink:href="#linearGradient24679-1-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="34.685287"
+ x2="60.676094"
+ y1="37.960625"
+ x1="63.666252"
+ gradientTransform="translate(-1.54625,-1)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16396"
+ xlink:href="#linearGradient1610-87-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="52.25"
+ x2="56"
+ y1="56.5"
+ x1="60.25"
+ gradientTransform="translate(-0.5,-21)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16394"
+ xlink:href="#linearGradient1610-87-1"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="54.130001"
+ x2="57.789688"
+ y1="56.5"
+ x1="60.25"
+ gradientTransform="translate(-0.5,-21)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient16392"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list