[libreoffice] 01/01: fix merge
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.
commit 859126c47b938d1c0811002d6414a5401d1983cc
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 19 22:32:49 2014 +0200
fix merge
---
changelog | 1 -
1 file changed, 1 deletion(-)
diff --git a/changelog b/changelog
index 5710e87..56306db 100644
--- a/changelog
+++ b/changelog
@@ -30,7 +30,6 @@ libreoffice (1:4.3.0~rc3-1) experimental; urgency=low
* debian/rules, debian/control.in: revert images.zip Depends: workaround,
symlink still seems to be broken somehow, keep that
- * debian/rules, debian/control.in: revert images.zip workarounds
* debian/rules: remove unused (and buggy?) manual --with-images= when not
building kde and/or gtk. Obsolete as upstream builds with all images
per default anyway. Sync IMAGES with upstream configure.ac (split galaxy
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: