libxmlsec/prj/build.lst | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 6fd193642d0c0a53f3831b0be83443b9d2867819
Author: Herbert Dürr <[email protected]>
Date: Thu Nov 7 06:28:21 2013 +0000
#i122365# remove moz_prebuilt from libxml's build.lst
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index b9ff932..579afce 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -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
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
