Merge lp://staging/~justinmcp/webbrowser-app/mediaplayer into lp://staging/webbrowser-app
Proposed by
Justin McPherson
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~justinmcp/webbrowser-app/mediaplayer |
| Merge into: | lp://staging/webbrowser-app |
| Diff against target: |
1082 lines (+991/-1) 11 files modified
src/Ubuntu/Web/Controls.qml (+285/-0) src/Ubuntu/Web/HLine.qml (+28/-0) src/Ubuntu/Web/IconButton.qml (+43/-0) src/Ubuntu/Web/MediaPlayer.qml (+226/-0) src/Ubuntu/Web/SceneFrame.qml (+79/-0) src/Ubuntu/Web/TimeLabel.qml (+58/-0) src/Ubuntu/Web/TimeLine.qml (+89/-0) src/Ubuntu/Web/UbuntuWebView02.qml (+36/-0) src/Ubuntu/Web/VLine.qml (+54/-0) src/Ubuntu/Web/VideoSlider.qml (+89/-0) src/app/webcontainer/webapp-container.cpp (+4/-1) |
| To merge this branch: | bzr merge lp://staging/~justinmcp/webbrowser-app/mediaplayer |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 1001. By Justin McPherson
-
Merge from trunk.
- 1000. By Justin McPherson <justin@phablet-dev>
-
WIP
- 999. By Justin McPherson <justin@phablet-dev>
-
WIP
- 998. By Justin McPherson <justin@phablet-dev>
-
WIP
- 997. By Justin McPherson <justin@phablet-dev>
-
WIP
- 996. By Justin McPherson <justin@phablet-dev>
-
WIP
- 995. By Justin McPherson <justin@phablet-dev>
-
WIP
- 994. By Justin McPherson <justin@phablet-dev>
-
WIP
- 993. By Justin McPherson <justin@phablet-dev>
-
WIP
- 992. By Justin McPherson <justin@phablet-dev>
-
wip
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
