[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51195] tags/blender-2.64a-release/blender : merge theme corrections

[Campbell Barton]

Revision: 51195
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51195
Author:   campbellbarton
Date:     2012-10-08 21:01:09 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
merge theme corrections
svn merge ^/trunk/blender -r51175
svn merge ^/trunk/blender -r51176

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51175
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51176

Modified Paths:
--------------
    tags/blender-2.64a-release/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml

Property Changed:
----------------
    tags/blender-2.64a-release/blender/


Property changes on: tags/blender-2.64a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51176,51181,51184-51186

Modified: tags/blender-2.64a-release/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
===================================================================
--- tags/blender-2.64a-release/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml	2012-10-08 20:32:52 UTC (rev 51194)
+++ tags/blender-2.64a-release/blender/release/scripts/presets/interface_theme/ubuntu_ambiance.xml	2012-10-08 21:01:09 UTC (rev 51195)
@@ -21,7 +21,7 @@
                    edge_select="#f68d46"
                    edge_sharp="#ff4c00"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
+                   empty="#93237f"
                    face="#75757512"
                    extra_face_angle="#002000"
                    extra_face_area="#0059ee"
@@ -44,7 +44,7 @@
                    outline_width="1"
                    panel="#a5a5a57f"
                    skin_root="#000000"
-                   speaker="#000000"
+                   speaker="#93237f"
                    transform="#ffffff"
                    handle_vect="#409030"
                    handle_sel_vect="#82c036"