Merge lp://qastaging/~abreu-alexandre/oxide/fix-trunk-build into lp://qastaging/~oxide-developers/oxide/oxide.trunk
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Merged at revision: | 1272 |
| Proposed branch: | lp://qastaging/~abreu-alexandre/oxide/fix-trunk-build |
| Merge into: | lp://qastaging/~oxide-developers/oxide/oxide.trunk |
| Diff against target: |
48 lines (+9/-7) 3 files modified
shared/renderer/media/oxide_media_info_loader.cc (+3/-3) shared/renderer/media/oxide_web_media_player.cc (+3/-2) shared/renderer/media/oxide_web_media_player.h (+3/-2) |
| To merge this branch: | bzr merge lp://qastaging/~abreu-alexandre/oxide/fix-trunk-build |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Olivier Tilloy (community) | Approve | ||
| Chris Coulson | Pending | ||
|
Review via email:
|
|||
Commit message
Fix trunk build
Description of the change
Fix trunk build
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
LGTM.