Merge lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge into lp://qastaging/ubuntu/wily/epiphany-browser
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge |
| Merge into: | lp://qastaging/ubuntu/wily/epiphany-browser |
| Diff against target: |
11870 lines (+370/-5393) 24 files modified
.pc/00_epiphany-browser.patch/configure.ac (+0/-261) .pc/07_bookmarks.patch/data/default-bookmarks.rdf.in (+0/-37) .pc/12_safetypes.patch/data/mime-types-permissions.xml (+0/-482) .pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c (+0/-363) .pc/applied-patches (+0/-5) .pc/ubuntu_titlebars.patch/src/ephy-window.c (+0/-4026) ChangeLog (+86/-0) NEWS (+8/-0) configure (+11/-11) configure.ac (+1/-1) debian/changelog (+23/-0) debian/control (+1/-1) debian/control.in (+1/-1) debian/patches/00_epiphany-browser.patch (+6/-8) embed/web-extension/ephy-web-extension.c (+16/-6) help/de/de.po (+5/-5) help/de/pref-do-not-track.page (+1/-2) lib/ephy-web-dom-utils.c (+11/-15) lib/ephy-web-dom-utils.h (+5/-4) po/ca.po (+4/-4) po/eo.po (+1/-1) po/th.po (+188/-158) src/ephy-shell-search-provider-generated.c (+1/-1) src/ephy-shell-search-provider-generated.h (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
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
Thanks! Uploaded.