Author: damjan
Date: Wed Feb 24 20:05:55 2016
New Revision: 1732213
URL: http://svn.apache.org/viewvc?rev=1732213&view=rev
Log:
Merge r1409430 from branches/gbuild:
writerfilter10: clear d.lst in converted writerfilter
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/prj/d.lst
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 20:05:55 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/writerfilter/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/prj/d.lst?rev=1732213&r1=1732212&r2=1732213&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/writerfilter/prj/d.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/writerfilter/prj/d.lst Wed
Feb 24 20:05:55 2016
@@ -1,8 +0,0 @@
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\writerfilter.component %_DEST%\xml%_EXT%\writerfilter.component
-
-mkdir: %_DEST%\inc%_EXT%\writerfilter\doctok
-..\%__SRC%\inc\doctok\sprmids.hxx
%_DEST%\inc%_EXT%\writerfilter\doctok\sprmids.hxx
