[libreoffice] 01/03: Merge remote-tracking branch 'origin/debian-experimental-5.0'
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a25d8447342a4518472f801154ff288dfd033b97
Merge: be5da63 21d8455
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 26 20:29:23 2015 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.0'
changelog | 18 ++++++++
control | 2 -
patches/disable-flaky-tests.diff | 79 ++++++++++++++------------------
patches/disable-tiledrendering-test.diff | 17 -------
patches/icu-56.diff | 60 +++++++++++-------------
patches/series | 1 -
rules | 17 ++-----
scripts/get_ttf_version.pl | 32 +++++++++++++
8 files changed, 115 insertions(+), 111 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: