summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCI Train Bot <ci-train-bot@canonical.com>2015-08-24 05:10:23 +0000
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-08-26 11:50:17 +0000
commit1bbb334a9e3212a0fa8b06a328dadb6b0702fe1a (patch)
tree5099269653fc9f090328782224e1f799f8b48640
parent5301ae7dcf474cb8d1b81439e0c6003d4b448b0f (diff)
Resync trunk.
Change-Id: Ifaffddb98ed6050a4beff50350b6811a431aadd5 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
-rw-r--r--debian/changelog46
1 files changed, 26 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 35853bd..7bd8f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,10 @@
-qtmir (0.4.5+15.04.20150821-0ubuntu1) vivid; urgency=medium
+qtmir (0.4.5+15.10.20150817-0ubuntu1) wily; urgency=medium
- [ Daniel d'Andrada ]
- * Improve handling of applications that are stopping or getting killed
- (LP: #1483840, #1485608)
+ *
- [ Gerry Boland ]
- * AppMan: if app destroys surface while in Running state, it is
- probably shutting down, so preempt it by removing it from the model
+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 17 Aug 2015 19:28:26 +0000
- -- CI Train Bot <ci-train-bot@canonical.com> Fri, 21 Aug 2015 11:40:14 +0000
-
-qtmir (0.4.5+15.04.20150820-0ubuntu1) vivid; urgency=medium
-
- [ Gerry Boland ]
- * Hotfix to work around bug 1483752 (LP: #1483752)
-
- [ Michael Zanetti ]
- * Hotfix to work around bug 1483752 (LP: #1483752)
-
- -- CI Train Bot <ci-train-bot@canonical.com> Thu, 20 Aug 2015 12:59:54 +0000
-
-qtmir (0.4.5+15.04.20150812.1-0ubuntu1) vivid; urgency=medium
+qtmir (0.4.5+15.10.20150812.1-0ubuntu1) vivid; urgency=medium
[ Daniel van Vugt ]
* MirSurfaceItem: Remove an unnecessary and potentially infinite loop
@@ -40,6 +24,28 @@ qtmir (0.4.5+15.10.20150804.1-0ubuntu1) vivid; urgency=medium
-- Gerry Boland <gerry.boland@canonical.com> Tue, 04 Aug 2015 17:21:12 +0000
+qtmir (0.4.5+15.04.20150821-0ubuntu1) vivid; urgency=medium
+
+ [ Daniel d'Andrada ]
+ * Improve handling of applications that are stopping or getting killed
+ (LP: #1483840, #1485608)
+
+ [ Gerry Boland ]
+ * AppMan: if app destroys surface while in Running state, it is
+ probably shutting down, so preempt it by removing it from the model
+
+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 21 Aug 2015 11:40:14 +0000
+
+qtmir (0.4.5+15.04.20150820-0ubuntu1) vivid; urgency=medium
+
+ [ Gerry Boland ]
+ * Hotfix to work around bug 1483752 (LP: #1483752)
+
+ [ Michael Zanetti ]
+ * Hotfix to work around bug 1483752 (LP: #1483752)
+
+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 20 Aug 2015 12:59:54 +0000
+
qtmir (0.4.5+15.10.20150804.1-0ubuntu1) wily; urgency=medium
[ Alan Griffiths ]