QtMir

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

  1. gles-sync
  2. Merge into gles
Proposed by Gerry Boland on 2015-01-21
Status: Merged
Approved by: Łukasz Zemczak on 2015-02-06
Approved revision: no longer in the source branch.
Merged at revision: 68
Proposed branch: lp:~mir-team/qtmir/gles-sync
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
Reviewer Review Type Date Requested Status
Mir development team 2015-01-21 Pending
Review via email: mp+247197@code.launchpad.net

Commit Message

Sync with upstream

To post a comment you must log in.
lp:~mir-team/qtmir/gles-sync updated on 2015-02-06
68. By Michał Sawicz on 2015-02-06

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 2015-01-15 15:59:48 +0000
3+++ debian/changelog 2015-02-06 10:10:23 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.4+15.04.20150206-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 04 Feb 2015 11:06:38 +0100
10+
11 qtmir-gles (0.4.4+15.04.20150115-0ubuntu1) vivid; urgency=medium
12
13 [ Michał Sawicz ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-01-13 18:24:51 +0000
17+++ debian/watch 2015-02-06 10:10:23 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-018/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-009/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: