Author: kschenk
Date: Thu Sep 24 22:48:11 2015
New Revision: 1705185
URL: http://svn.apache.org/viewvc?rev=1705185&view=rev
Log:
#i125897# Merged from trunk r1661077
Modified:
openoffice/branches/AOO410/main/extras/source/palettes/ (props changed)
openoffice/branches/AOO410/main/extras/source/palettes/standard.soc
Propchange: openoffice/branches/AOO410/main/extras/source/palettes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 24 22:48:11 2015
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/extras/source/palettes:1503684
+/openoffice/branches/ia2/main/extras/source/palettes:1417739-1541842
+/openoffice/branches/ooxml-osba/main/extras/source/palettes:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/extras/source/palettes:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/extras/source/palettes:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1661077,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988
Modified: openoffice/branches/AOO410/main/extras/source/palettes/standard.soc
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/extras/source/palettes/standard.soc?rev=1705185&r1=1705184&r2=1705185&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/extras/source/palettes/standard.soc
(original)
+++ openoffice/branches/AOO410/main/extras/source/palettes/standard.soc Thu Sep
24 22:48:11 2015
@@ -37,7 +37,7 @@
<draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
<draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
<draw:color draw:name="Blue 1" draw:color="#9999ff"/>
- <draw:color draw:name="Sky blue 1" draw:color="#9999ff"/>
+ <draw:color draw:name="Sky blue 1" draw:color="#66ccff"/>
<draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
<draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
<draw:color draw:name="Green 1" draw:color="#99ff99"/>
@@ -195,4 +195,4 @@
<draw:color draw:name="Chart 10" draw:color="#ff950e"/>
<draw:color draw:name="Chart 11" draw:color="#c5000b"/>
<draw:color draw:name="Chart 12" draw:color="#0084d1"/>
-</office:color-table>
\ No newline at end of file
+</office:color-table>
