Merge lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge2 into lp://qastaging/ubuntu/wily/epiphany-browser
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Robert Ancell |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge2 |
Merge into: | lp://qastaging/ubuntu/wily/epiphany-browser |
Diff against target: |
12870 lines (+1091/-6067) 41 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 (+70/-0) Makefile.in (+6/-2) NEWS (+8/-0) aclocal.m4 (+6/-841) configure (+11/-11) configure.ac (+1/-1) data/Makefile.in (+6/-2) data/pages/Makefile.in (+6/-2) debian/changelog (+21/-0) debian/control (+1/-1) debian/patches/00_epiphany-browser.patch (+4/-4) doc/Makefile.in (+6/-2) embed/Makefile.in (+6/-2) embed/ephy-embed-utils.c (+17/-3) embed/ephy-web-view.c (+12/-0) embed/web-extension/Makefile.in (+6/-2) embed/web-extension/ephy-web-extension.c (+2/-0) help/Makefile.in (+6/-2) lib/Makefile.in (+6/-2) lib/egg/Makefile.in (+6/-2) lib/history/Makefile.in (+6/-2) lib/widgets/Makefile.in (+6/-2) m4/ax_check_enable_debug.m4 (+113/-0) m4/ax_code_coverage.m4 (+180/-0) m4/gsettings.m4 (+83/-0) m4/nls.m4 (+32/-0) m4/pkg.m4 (+214/-0) m4/yelp.m4 (+213/-0) src/Makefile.in (+6/-2) src/bookmarks/Makefile.in (+6/-2) src/ephy-search-provider-main.c (+11/-0) src/ephy-shell-search-provider-generated.c (+1/-1) src/ephy-shell-search-provider-generated.h (+1/-1) tests/Makefile.in (+6/-2) tests/data/Makefile.in (+6/-2) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/wily/epiphany-browser/merge2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email:
|
Description of the change
Merge from debian
To post a comment you must log in.
This already seems to have been done.