Author: hdu
Date: Thu Nov 7 06:28:21 2013
New Revision: 1539532
URL: http://svn.apache.org/r1539532
Log:
#i122365# remove moz_prebuilt from libxml's build.lst
Modified:
openoffice/trunk/main/libxmlsec/prj/build.lst
Modified: openoffice/trunk/main/libxmlsec/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxmlsec/prj/build.lst?rev=1539532&r1=1539531&r2=1539532&view=diff
==============================================================================
--- openoffice/trunk/main/libxmlsec/prj/build.lst (original)
+++ openoffice/trunk/main/libxmlsec/prj/build.lst Thu Nov 7 06:28:21 2013
@@ -1,7 +1,3 @@
-<<<<<<< Updated upstream
-ls libxmlsec : stlport soltools LIBXML2:libxml2 NSS:nss SO:moz_prebuilt NULL
-=======
ls libxmlsec : stlport soltools LIBXML2:libxml2 NSS:nss NULL
->>>>>>> Stashed changes
ls libxmlsec usr1 - all
ls_mkout NULL
ls libxmlsec nmake - all
ls_xmlsec1 NULL
