[Bf-blender-cvs] [610a04a] missing-libs: Fix rebase mess :/

[Bastien Montagne]

Commit: 610a04ab5de42576647a26219f93aa9248b6253f
Author: Bastien Montagne
Date:   Wed Jul 15 20:38:51 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB610a04ab5de42576647a26219f93aa9248b6253f

Fix rebase mess :/

===================================================================

M	release/datafiles/blender_icons.svg
M	release/datafiles/blender_icons16/icon16_library_data_broken.dat
M	release/datafiles/blender_icons32/icon32_library_data_broken.dat

===================================================================

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 0f20afa..a66bad3 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -30310,15 +30310,15 @@
     <filter
        inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
-       id="filter17919"
-       x="-0.089230809"
-       width="1.1784616"
-       y="-0.18315773"
-       height="1.3663155">
+       id="filter17889"
+       x="-0.044615405"
+       width="1.0892308"
+       y="-0.091578864"
+       height="1.1831577">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="0.50298775"
-         id="feGaussianBlur17921" />
+         stdDeviation="0.25149387"
+         id="feGaussianBlur17891" />
     </filter>
   </defs>
   <sodipodi:namedview
@@ -30331,9 +30331,9 @@
      objecttolerance="10000"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.548036"
-     inkscape:cx="102.64533"
-     inkscape:cy="222.87199"
+     inkscape:zoom="40.768576"
+     inkscape:cx="236.56738"
+     inkscape:cy="163.14077"
      inkscape:document-units="px"
      inkscape:current-layer="g24024-1"
      showgrid="true"
@@ -90666,12 +90666,6 @@
            d="m 299,365 16,0 0,16 -16,0 z"
            id="rect22150-8"
            inkscape:connector-curvature="0" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#ff5555;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter17919)"
-           d="m 313.8621,371.34594 -3.26074,-1.59569 -1.17942,4.50955 -5.41146,-1.8732 -0.97129,3.95453 -2.70572,-0.90191"
-           id="path30830"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
         <g
            id="g31699">
           <path
@@ -90739,6 +90733,12 @@
              d="m 313.09408,371.70574 -1.86133,-0.91015 -1.17968,4.50976 -5.41016,-1.87304 -0.97266,3.95312 -1.57617,-0.53516 0,3.73829 11,0 0,-8.88282 z"
              style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#fe0000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter17889)"
+           d="m 313.8621,371.34594 -3.26074,-1.59569 -1.17942,4.50955 -5.41146,-1.8732 -0.97129,3.95453 -2.70572,-0.90191"
+           id="path30830"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
       </g>
     </g>
   </g>
diff --git a/release/datafiles/blender_icons16/icon16_library_data_broken.dat b/release/datafiles/blender_icons16/icon16_library_data_broken.dat
index 8d1a176..e0ede6b 100644
Binary files a/release/datafiles/blender_icons16/icon16_library_data_broken.dat and b/release/datafiles/blender_icons16/icon16_library_data_broken.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_library_data_broken.dat b/release/datafiles/blender_icons32/icon32_library_data_broken.dat
index 063b1c3..e1ec782 100644
Binary files a/release/datafiles/blender_icons32/icon32_library_data_broken.dat and b/release/datafiles/blender_icons32/icon32_library_data_broken.dat differ