[SCM] breeze packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.3.2-0ubuntu2-12-gedd6a4c
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Aug 7 12:59:13 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=edd6a4c
The following commit has been merged in the kubuntu_wily_archive branch:
commit edd6a4c6ef492e8f5177a4e63fc4d17765f65e41
Merge: 787b3d30fa8a822750573e6c82bcb60991b91458 7473fd16fbcb37e7dff530b5cd45fb152177a564
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Aug 4 21:17:07 2015 -0700
* Manual merge. * Fix merge again. * Fix merge yet again.
* Manual merge.
* Fix merge again.
* Fix merge yet again.
debian/breeze-cursor-theme.install | 3 +++
debian/changelog | 4 ++++
debian/rules | 7 +++++++
3 files changed, 14 insertions(+)
diff --cc debian/changelog
index 183aab3,708ae7f..613d1f4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,10 +1,11 @@@
breeze (4:5.3.2-0ubuntu3) UNRELEASED; urgency=medium
- * Vivid backport
+ * Vivid backport
+ * Manual merge.
* Fix merge.
+ * Fix merge again.
+ * Fix merge yet again.
++ * Merge problems again.
-- Scarlett Clark <sgclark at kubuntu.org> Tue, 04 Aug 2015 21:01:53 -0700
--
breeze packaging
More information about the pkg-kde-commits
mailing list