[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 9eafe86dd7febf22b3da739b08a5c19ceeefc9e4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 1 13:01:05 2012 +0100
fix mismerge: pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff is already upstreamed to debian
diff --git a/patches/series b/patches/series
index 15b93c2..ddf6f3d 100644
--- a/patches/series
+++ b/patches/series
@@ -38,7 +38,6 @@ passwordTest-test-old-password-algorith-too.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
pkgconfig-mozilla-plugin.diff
-pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
ubuntu-quicklists.diff
fix-quickstart-shutdown.diff
fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
--
LibreOffice packaging repository
Reply to: