[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.1-0ubuntu1-24-g6f7707f

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=6f7707f

The following commit has been merged in the kubuntu_unstable branch:
commit 6f7707f657dca1cbc4d1ecd3490d601a3594e1cf
Merge: da49652cc1b3f09f5a7e6cc22d29d26105ebbcea 4d4f6977ef55e240801d3f9feb0fa3e95bde90a2
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Thu Oct 1 21:40:16 2015 +0000

    Merging kubuntu_stable into kubuntu_unstable.

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 01a397e,8c677e0..28172b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +marble (4:15.11.80-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Build with MARBLE_INSTALL_ANDROID_APPS
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Sep 2015 13:20:57 +0100
 +
+ marble (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 01 Oct 2015 12:37:49 -0700
+ 
  marble (4:15.08.1-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]

-- 
marble packaging