Merge lp:~phablet-team/webbrowser-app/OTA-15 into lp:~phablet-team/webbrowser-app/OTA-14-vivid
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Merged at revision: | 1529 |
Proposed branch: | lp:~phablet-team/webbrowser-app/OTA-15 |
Merge into: | lp:~phablet-team/webbrowser-app/OTA-14-vivid |
Diff against target: |
250 lines (+107/-42) 8 files modified
CMakeLists.txt (+0/-5) debian/changelog (+11/-0) debian/control (+1/-2) src/Ubuntu/CMakeLists.txt (+0/-8) src/Ubuntu/Web/UbuntuWebContext.qml (+7/-1) src/Ubuntu/Web/ua-overrides-desktop.js.in (+43/-14) src/Ubuntu/Web/ua-overrides-mobile.js.in (+39/-12) tests/unittests/qml/CMakeLists.txt (+6/-0) |
To merge this branch: | bzr merge lp:~phablet-team/webbrowser-app/OTA-15 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email:
|
To post a comment you must log in.