[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-68-g43ed799
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit e61669ff10706e231410b4e2e879599377975a06
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Aug 31 19:02:57 2012 +0200
remove conflict markers
diff --git a/changelog b/changelog
index ff73d31..07b3b33 100644
--- a/changelog
+++ b/changelog
@@ -164,11 +164,8 @@ libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
- add ENABLE_HELP conditional now that we have --without-help; also
add the new --disable-extensions and --disable-database-connectivity to
their respective places
-<<<<<<< HEAD
-=======
- split build into build-{arch,indep}
- use generic python3.pc instead of pythonX.Y(mu).pc
->>>>>>> debian-experimental-3.6
* debian/uno-libs3.symbols: update
* debian/libreoffice-common.links.in:
- s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
--
LibreOffice packaging repository
Reply to: