Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/oxide-backport-14.04 into lp://staging/ubuntu-html5-theme/14.04
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Merged at revision: | 177 |
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/oxide-backport-14.04 |
| Merge into: | lp://staging/ubuntu-html5-theme/14.04 |
| Diff against target: |
162 lines (+37/-27) 5 files modified
CMakeLists.txt (+4/-0) src/plugin/Ubuntu/WebApps/CordovaLoader.qml (+5/-0) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml (+5/-1) src/plugin/Ubuntu/WebApps/WebAppContainer.qml (+14/-17) src/ubuntu-html5-app-launcher/main.cpp (+9/-9) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/oxide-backport-14.04 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
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
