Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport into lp://staging/ubuntu-html5-theme
Proposed by
Alexandre Abreu
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport |
| Merge into: | lp://staging/ubuntu-html5-theme |
| Diff against target: |
261 lines (+187/-0) (has conflicts) 5 files modified
debian/control (+15/-0) src/plugin/Ubuntu/WebApps/CordovaLoader.qml.OTHER (+96/-0) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml.OTHER (+63/-0) tests/autopilot/tools/qml/webview.qml (+5/-0) tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py (+8/-0) Text conflict in debian/control Contents conflict in src/plugin/Ubuntu/WebApps/CordovaLoader.qml Contents conflict in src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml Text conflict in tests/autopilot/tools/qml/webview.qml Text conflict in tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-03-16.
Description of the change
Backport HTML5 fixes and updates to 14.10
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 177. By Alexandre Abreu
-
bundle backport of trunk features needed
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:177
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://