QtMir

Merge lp:~unity-team/qtmir/gles-sync1 into lp:qtmir/gles

  1. gles-sync1
  2. Merge into gles
Proposed by Gerry Boland
Status: Merged
Merged at revision: 158
Proposed branch: lp:~unity-team/qtmir/gles-sync1
Merge into: lp:qtmir/gles
Diff against target: 36 lines (+10/-1) (has conflicts)
2 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unity-team/qtmir/gles-sync1
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+289661@code.launchpad.net

Commit message

Surface-based WM

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-03-10 09:30:00 +0000
3+++ debian/changelog 2016-03-22 16:15:55 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 qtmir-gles (0.4.7+16.04.20160310.1-0ubuntu1) xenial; urgency=medium
7
8 [ CI Train Bot ]
9@@ -5,6 +6,14 @@
10
11 -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 10 Mar 2016 09:30:00 +0000
12
13+=======
14+qtmir-gles (0.4.8) UNRELEASED; urgency=medium
15+
16+ * New upstream release
17+
18+ -- Michal Sawicz <michal.sawicz@canonical.com> Tue, 16 Feb 2016 19:53:56 +0100
19+
20+>>>>>>> MERGE-SOURCE
21 qtmir-gles (0.4.7+16.04.20160219-0ubuntu1) xenial; urgency=medium
22
23 * No change for Mir 0.20
24
25=== modified file 'debian/control'
26--- debian/control 2016-02-12 00:07:34 +0000
27+++ debian/control 2016-03-22 16:15:55 +0000
28@@ -28,7 +28,7 @@
29 libubuntu-app-launch2-dev,
30 libubuntu-application-api-dev (>= 2.1.0),
31 libudev-dev,
32- libunity-api-dev (>= 7.106),
33+ libunity-api-dev (>= 7.108),
34 liburl-dispatcher1-dev,
35 libxkbcommon-dev,
36 libxrender-dev,

Subscribers

People subscribed via source and target branches