QtMir

Merge lp:~unity-team/qtmir/gles-sync-20140806 into lp:qtmir/gles

  1. gles-sync-20140806
  2. Merge into gles
Proposed by kevin gunn
Status: Merged
Approved by: Michał Sawicz
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~unity-team/qtmir/gles-sync-20140806
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:~unity-team/qtmir/gles-sync-20140806
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+229871@code.launchpad.net

Commit message

sync with upstream

Description of the change

sync with upstream

To post a comment you must log in.
lp:~unity-team/qtmir/gles-sync-20140806 updated
10. By kevin gunn

update changelog

Revision history for this message
Michał Sawicz (saviq) wrote :

Yess.

review: Approve
lp:~unity-team/qtmir/gles-sync-20140806 updated
11. By Gerry Boland

Update

12. By Gerry Boland

Merge trunk

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-08-08 13:09:25 +0000
3+++ debian/changelog 2014-08-11 17:26:59 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.1+14.10.20140811-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Kevin Gunn <kevin.gunn@canonical.com> Mon, 11 Aug 2014 16:40:51 -0500
10+
11 qtmir-gles (0.4.1+14.10.20140808-0ubuntu1) utopic; urgency=medium
12
13 [ Thomas Voß ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-08-08 13:02:12 +0000
17+++ debian/watch 2014-08-11 17:26:59 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-004/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-002/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches