QtMir

Merge lp:~mir-team/qtmir/gles-sync-mir into lp:qtmir/gles

  1. gles-sync-mir
  2. Merge into gles
Proposed by Cemil Azizoglu
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 38
Proposed branch: lp:~mir-team/qtmir/gles-sync-mir
Merge into: lp:qtmir/gles
Diff against target: 22 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~mir-team/qtmir/gles-sync-mir
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+236423@code.launchpad.net

Commit message

Sync with upstream.

Description of the change

Sync with upstream.

To post a comment you must log in.
lp:~mir-team/qtmir/gles-sync-mir updated
38. By Cemil Azizoglu

Sync with upstream.

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 2014-10-06 12:21:52 +0000
3+++ debian/changelog 2014-10-10 16:56:17 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.3+14.10.20141010-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Cemil Azizoglu <cemil.azizoglu@canonical.com> Fri, 10 Oct 2014 11:56:47 -0500
10+
11 qtmir-gles (0.4.3+14.10.20141006-0ubuntu1) utopic; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-10-03 02:29:28 +0000
17+++ debian/watch 2014-10-10 16:56:17 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-019/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-003/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: