[SCM] kemoticons packaging branch, master, updated. debian/5.37.0-2-86-gcaf9daf
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:40:06 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kemoticons.git;a=commitdiff;h=8fffb71
The following commit has been merged in the master branch:
commit 8fffb717401716159f93f92175274320c2a1bc76
Author: Harald Sitter <sitter at kde.org>
Date: Tue Jul 14 09:52:12 2015 +0200
fix merge
---
debian/changelog | 8 --------
1 file changed, 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 16f1206..617c446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,8 @@
-<<<<<<< HEAD
kemoticons (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release
-- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:07:41 -0700
-=======
-kemoticons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
-
- * Vivid backport
-
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:16:47 -0700
kemoticons (5.11.0-1) unstable; urgency=medium
@@ -17,7 +10,6 @@ kemoticons (5.11.0-1) unstable; urgency=medium
* New upstream release (5.11.0).
-- Maximiliano Curia <maxy at debian.org> Sun, 28 Jun 2015 16:03:48 +0200
->>>>>>> origin/kubuntu_unstable
kemoticons (5.10.0-0ubuntu1) wily; urgency=medium
--
kemoticons packaging
More information about the pkg-kde-commits
mailing list