[Bf-blender-cvs] [eb806d1] temp_custom_loop_normals: Merge branch 'master' into temp_custom_loop_normals

[Bastien Montagne]

Commit: eb806d11be5108c22ab83cf7e36d8d2da5a095ea
Author: Bastien Montagne
Date:   Thu Oct 23 15:04:05 2014 +0200
Branches: temp_custom_loop_normals
https://developer.blender.org/rBeb806d11be5108c22ab83cf7e36d8d2da5a095ea

Merge branch 'master' into temp_custom_loop_normals

Conflicts:
	release/datafiles/blender_icons.svg

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



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

diff --cc release/datafiles/blender_icons.svg
index 2e122b6,ed5e847..37f071f
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@@ -28411,11 -29064,11 +29064,11 @@@
       objecttolerance="10000"
       inkscape:pageopacity="0.0"
       inkscape:pageshadow="2"
-      inkscape:zoom="14.079486"
-      inkscape:cx="290.30777"
-      inkscape:cy="386.06298"
+      inkscape:zoom="8"
+      inkscape:cx="475.21328"
+      inkscape:cy="281.82297"
       inkscape:document-units="px"
 -     inkscape:current-layer="layer1"
 +     inkscape:current-layer="g18697-9"
       showgrid="true"
       inkscape:window-width="1920"
       inkscape:window-height="980"