[SCM] kdbusaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-10-gc2ce41c
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Sat Jul 11 14:51:58 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdbusaddons.git;a=commitdiff;h=1e9c1a1
The following commit has been merged in the kubuntu_wily_archive branch:
commit 1e9c1a1f579186d4529c47735e9e7e006ad7de40
Merge: 70c06214fcd60e9d8c864bcc42911873bbad8da5 38ea362d04aa4676c931fc7878a41d6cabd7ae76
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed Jul 8 09:54:32 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
Conflicts:
debian/changelog
debian/changelog | 4 ++++
debian/control | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 679d954,a1a8d1c..dff1c4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
kdbusaddons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
++ [ Scarlett Clark ]
+ * Vivid backport
+
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:11:04 -0700
++ [ Harald Sitter ]
+ * hashtagyolo
+
+ -- Harald Sitter <sitter at kde.org> Thu, 02 Jul 2015 12:35:05 +0200
kdbusaddons (5.10.0-0ubuntu1) wily; urgency=medium
--
kdbusaddons packaging
More information about the pkg-kde-commits
mailing list