Author: damjan
Date: Wed Mar 16 16:42:19 2016
New Revision: 1735262
URL: http://svn.apache.org/viewvc?rev=1735262&view=rev
Log:
Merge from branches/gbuild:
* r1409615: Bug 117171 - [Automation]:Separating keyboard input in id_tools.inc
* r1409616: Adding printlogs
BUILDS (by extrapolation, as the patches are no-ops since their
main/testautomation directory was deleted in r1414017 by jsc with message:
"#121389# remove old testool resources and obsolete testautomation module")
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 16 16:42:19 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409614,1409617
+/incubator/ooo/branches/gbuild:1409313-1409617
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
