Merge lp:~gerboland/qtubuntu/gles-sync-silo5 into lp:qtubuntu
Proposed by
Gerry Boland
Status: | Superseded |
---|---|
Proposed branch: | lp:~gerboland/qtubuntu/gles-sync-silo5 |
Merge into: | lp:qtubuntu |
Diff against target: |
254 lines (+207/-0) (has conflicts) 9 files modified
debian/changelog (+79/-0) debian/compat (+1/-0) debian/control (+45/-0) debian/copyright (+48/-0) debian/docs (+1/-0) debian/qtubuntu-android.install (+1/-0) debian/rules (+28/-0) debian/source/format (+1/-0) debian/watch (+3/-0) Conflict adding file debian. Moved existing file to debian.moved. |
To merge this branch: | bzr merge lp:~gerboland/qtubuntu/gles-sync-silo5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email: mp+230969@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-08-15.
Description of the change
Sync with qtubuntu
To post a comment you must log in.
Unmerged revisions
- 9. By Gerry Boland
-
Sync with trunk
- 8. By PS Jenkins bot
-
Releasing 0.60+14.
10.20140812- 0ubuntu1 - 7. By Ricardo Salveti
-
Sync package with qtubuntu - 0.60+14.
10.20140806- 0ubuntu1 - 6. By PS Jenkins bot
-
Releasing 0.60+14.
10.20140808. 1-0ubuntu1 - 5. By Timo Jyrinki
-
Sync with upstream. Fixes: 1351024
Approved by: Timo Jyrinki - 4. By PS Jenkins bot
-
Releasing 0.60+14.
10.20140728- 0ubuntu1 - 3. By Gerry Boland
-
Sync with qtubuntu 0.60+14.
10.20140724- 0ubuntu1
Approved by: Gerry Boland - 2. By Ricardo Salveti
-
debian/watch: changing to a silo that doesn't exist, so it can be used as reference
- 1. By Ricardo Salveti
-
releasing package qtubuntu-gles version 0.54+14.
10.20140613- 0ubuntu2