Merge lp:~mblayman/entertainer/videos-1.0 into lp:entertainer/future
Proposed by
Matt Layman
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~mblayman/entertainer/videos-1.0 |
Merge into: | lp:entertainer/future |
Prerequisite: | lp:~mblayman/entertainer/photos-1.0 |
Diff against target: |
216 lines (+50/-27) 8 files modified
entertainerlib/client/media_player.py (+1/-1) entertainerlib/gui/screens/factory.py (+6/-8) entertainerlib/gui/screens/movie.py (+6/-2) entertainerlib/gui/screens/tv_episodes.py (+1/-0) entertainerlib/gui/screens/video_osd.py (+31/-16) entertainerlib/gui/tabs/movies_tab.py (+2/-0) entertainerlib/gui/tabs/series_tab.py (+1/-0) entertainerlib/gui/tabs/video_clips_tab.py (+2/-0) |
To merge this branch: | bzr merge lp:~mblayman/entertainer/videos-1.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Entertainer Release Team | Pending | ||
Review via email: mp+16469@code.launchpad.net |
Commit message
All video screens have been fixed for clutter 1.0.
To post a comment you must log in.
Branch 6 of clutter 1.0 transition.