[libreoffice] 01/02: fix merge
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 30ddd138246a8fff5168bccb8e4db9565953d851
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 23 19:44:52 2016 +0200
fix merge
---
changelog | 2 --
1 file changed, 2 deletions(-)
diff --git a/changelog b/changelog
index b91ba42..be0a659 100644
--- a/changelog
+++ b/changelog
@@ -11,8 +11,6 @@ libreoffice (1:5.2.0~beta1~git20160513-1) UNRELEASED; urgency=medium
* debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
to /usr/include since -isystem /usr/include makes the stuff FTBFS
with gcc 6 (closes: #823145)
- * debian/patches/mdds-1.2.0.diff: backport patch to build with mdds 1.2
- from master
* debian/*.lintian-overrides: remove obsolete
binary-or-shlib-defines-rpath and no-debconf-config overrides
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: