Author: damjan
Date: Thu Feb 25 19:26:07 2016
New Revision: 1732350
URL: http://svn.apache.org/viewvc?rev=1732350&view=rev
Log:
Pretend merge r1409466:
writerfilter10: make CppunitTest run for wntmsci12
as we no longer need it since we use GoogleTest instead of CppunitTest,
it builds executables instead of shared libraries, and it builds and
runs fine w/o this patch.
BUILDS
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 19:26:07 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409465,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409465-1409466,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
