[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

[Rene Engelhard]

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 332de7e3127139b49d452d41ef7590bd239aad66
Merge: 83db3c3 dc7168f
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 22 00:12:51 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog

 changelog                 |  7 +++++++
 scripts/get_libvlc_dep.sh | 27 +++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --cc changelog
index 3b04aa0,cce1cc3..8940fe1
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,10 +1,18 @@@
 +libreoffice (1:5.2.4~rc1~git20161020-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +    - fixes (experimental) Gtk print dialog crash (closes: #839701)
 +    - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 +
+ libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
+ 
+   * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+     new multiarchified libvlc 5
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 21 Oct 2016 23:56:08 +0200
+ 
  libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
  
    * debian/patches/fix-system-lpsolve-build.diff: fix -L in configure.ac so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git