Author: pfg
Date: Sun Sep 27 16:30:04 2015
New Revision: 1705552
URL: http://svn.apache.org/viewvc?rev=1705552&view=rev
Log:
partial revert of r1705547
Revert r1705543: unwanted typo
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 16:30:04 2015
@@ -2,5 +2,5 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,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,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,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,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551
/openoffice/trunk/main:1705369
Modified: openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst?rev=1705552&r1=1705551&r2=1705552&view=diff
==============================================================================
--- openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst Sun Sep 27
16:30:04 2015
@@ -10,7 +10,6 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
linklib: libaprutil-1.so.*.*
-linklib: libaprutil-1.so.*
# Mac
..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
