Author: damjan
Date: Sun Feb 21 02:57:17 2016
New Revision: 1731501
URL: http://svn.apache.org/viewvc?rev=1731501&view=rev
Log:
Branch trunk to gbuild-reintegration so branches/gbuild can be gradually
integrated back into trunk.
Added:
openoffice/branches/gbuild-reintegration/ (props changed)
- copied from r1731500, openoffice/trunk/main/
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 21 02:57:17 2016
@@ -0,0 +1,2 @@
+config.guess
+config.sub
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 21 02:57:17 2016
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/gbuild/main:1409397
+/openoffice/branches/AOO400/main:1503684
+/openoffice/branches/AOO410/main:1572480,1573601,1583349,1583635,1583666
+/openoffice/branches/alg_writerframes/main:1556289-1579189
+/openoffice/branches/ia2/main:1417739-1541842
+/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
