Merge lp://staging/~phablet-team/qtubuntu-media/media-hub-desktop into lp://staging/qtubuntu-media

Proposed by Jim Hodapp
Status: Merged
Approved by: Lorn Potter
Approved revision: 113
Merged at revision: 113
Proposed branch: lp://staging/~phablet-team/qtubuntu-media/media-hub-desktop
Merge into: lp://staging/qtubuntu-media
Diff against target: 70 lines (+15/-1)
5 files modified
debian/control (+1/-1)
tests/unit/player.cpp (+6/-0)
tests/unit/player.h (+1/-0)
tests/unit/player_mock.cpp (+6/-0)
tests/unit/player_mock.h (+1/-0)
To merge this branch: bzr merge lp://staging/~phablet-team/qtubuntu-media/media-hub-desktop
Reviewer Review Type Date Requested Status
Lorn Potter (community) Approve
Review via email: mp+302961@code.staging.launchpad.net

Commit message

Make media-hub work on the desktop. Everything except for video playback works with this commit.

Description of the change

Make media-hub work on the desktop. Everything except for video playback works with this commit.

To post a comment you must log in.
Revision history for this message
Lorn Potter (lorn-potter) wrote :

LGTM

Revision history for this message
Lorn Potter (lorn-potter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: