svn commit: r1755455 [18/18] - in /openoffice/trunk: ./ ext_libraries/apr-util/ ext_libraries/gtest/win/ ext_libraries/ratscan/scan/ ext_libraries/serf/win/ main/ main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/ main/basctl/source/dlg...

[damjan]

Modified: openoffice/trunk/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx 
(original)
+++ openoffice/trunk/main/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx Sun 
Aug  7 19:24:03 2016
@@ -29,7 +29,7 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
 #include <comphelper/processfactory.hxx>
 
 

Propchange: openoffice/trunk/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug  7 19:24:03 2016
@@ -8,6 +8,7 @@
 /incubator/ooo/trunk/test:1353792-1374969
 /openoffice/branches/alg/clibboard/test:1428975-1437368
 /openoffice/branches/alg_writerframes/test:1556289-1579189
+/openoffice/branches/gbuild-reintegration/test:1731503-1755453
 /openoffice/branches/ia2/test:1417739-1541842
 /openoffice/branches/rejuvenate01/test:1534063
 /openoffice/branches/sidebar/test:1415095-1466374