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 292c000e32f0d5c5caf2f72da8c3ac65eec7eaea
Merge: bf480c7 8711e2c
Author: Rene Engelhard <r...@debian.org>
Date: Fri Jan 29 15:13:21 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into
debian-experimental-5.2
Conflicts:
changelog
changelog | 10 ++++++++--
control | 4 ++--
control.gtk3.in | 2 +-
rules | 61 +++++++++++++++++++++++++++++++++------------------------
4 files changed, 46 insertions(+), 31 deletions(-)
diff --cc changelog
index 089c16f,c86f6cb..baf2530
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,6 +1,12 @@@
+libreoffice (1:5.2.0~alpha1~git20160120-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <r...@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate
* debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
(closes: #811686)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
