Merge lp://staging/~mterry/unity-lens-music/gst1 into lp://staging/unity-lens-music
Proposed by
Michael Terry
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Michael Terry | ||||
| Approved revision: | 119 | ||||
| Merged at revision: | 121 | ||||
| Proposed branch: | lp://staging/~mterry/unity-lens-music/gst1 | ||||
| Merge into: | lp://staging/unity-lens-music | ||||
| Diff against target: |
189 lines (+27/-25) 4 files modified
configure.ac (+3/-3) debian/control (+3/-3) src/Makefile.am (+2/-2) src/player.vala (+19/-17) |
||||
| To merge this branch: | bzr merge lp://staging/~mterry/unity-lens-music/gst1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Terry | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Port from gstreamer 0.10 to gstreamer 1.0
Description of the change
This is a follow-on of https:/
That branch failed because of a merge conflict, but since laney is on vacation, I'm finishing it up here. I resolved the conflict by removing the change to debian/changelog completely, since the autolander will flesh that out for us.
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
This was already approved before the minor merge conflict fix. So I'll approve here too.