Merge lp://qastaging/~l3on/ubuntu/precise/epiphany-extensions/new-release into lp://qastaging/ubuntu/precise/epiphany-extensions

Proposed by Leo Iannacone
Status: Merged
Merged at revision: 60
Proposed branch: lp://qastaging/~l3on/ubuntu/precise/epiphany-extensions/new-release
Merge into: lp://qastaging/ubuntu/precise/epiphany-extensions
Diff against target: 41129 lines (+5694/-28648)
91 files modified
.pc/applied-patches (+0/-1)
.pc/bump-epiphany-api.patch/configure (+0/-21460)
.pc/bump-epiphany-api.patch/configure.ac (+0/-327)
ChangeLog (+262/-5)
Makefile.in (+50/-28)
NEWS (+30/-3)
aclocal.m4 (+994/-938)
configure (+193/-112)
configure.ac (+4/-4)
data/Makefile.in (+16/-11)
data/icons/Makefile.in (+16/-11)
debian/changelog (+10/-0)
debian/control.in (+1/-1)
debian/patches/bump-epiphany-api.patch (+0/-32)
debian/patches/series (+0/-1)
depcomp (+66/-8)
extensions/Makefile.in (+16/-11)
extensions/actions/Makefile.in (+47/-48)
extensions/actions/ephy-actions-extension.c (+24/-28)
extensions/adblock/Makefile.am (+3/-13)
extensions/adblock/Makefile.in (+68/-120)
extensions/adblock/ad-blocker.c (+0/-202)
extensions/adblock/ad-blocker.h (+0/-79)
extensions/adblock/ad-uri-tester.c (+0/-221)
extensions/adblock/ad-uri-tester.h (+0/-67)
extensions/adblock/adblock-pattern.c (+0/-407)
extensions/adblock/adblock-pattern.h (+0/-55)
extensions/adblock/adblock-patterns (+0/-201)
extensions/adblock/adblock-ui.c (+318/-568)
extensions/adblock/adblock-ui.h (+21/-27)
extensions/adblock/adblock.ephy-extension.in.in (+3/-4)
extensions/adblock/adblock.ui (+147/-351)
extensions/adblock/ephy-adblock-extension.c (+237/-535)
extensions/adblock/ephy-adblock-extension.h (+18/-25)
extensions/adblock/extension.c (+12/-17)
extensions/adblock/uri-tester.c (+907/-0)
extensions/adblock/uri-tester.h (+71/-0)
extensions/auto-reload/Makefile.in (+40/-36)
extensions/auto-reload/ephy-auto-reload-extension.c (+2/-14)
extensions/auto-scroller/Makefile.in (+42/-39)
extensions/certificates/Makefile.in (+40/-36)
extensions/certificates/ephy-certificates-extension.c (+4/-4)
extensions/error-viewer/Makefile.in (+47/-48)
extensions/error-viewer/ephy-error-viewer-extension.c (+6/-6)
extensions/error-viewer/mozilla/Makefile.in (+43/-46)
extensions/error-viewer/opensp/Makefile.in (+35/-34)
extensions/extensions-manager-ui/Makefile.in (+43/-42)
extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c (+3/-46)
extensions/gestures/Makefile.in (+45/-45)
extensions/greasemonkey/Makefile.in (+42/-39)
extensions/html5tube/Makefile.in (+40/-36)
extensions/java-console/Makefile.in (+40/-36)
extensions/java-console/mozilla/Makefile.in (+35/-34)
extensions/livehttpheaders/Makefile.in (+43/-42)
extensions/livehttpheaders/ephy-livehttpheaders-extension.c (+1/-1)
extensions/livehttpheaders/mozilla/Makefile.in (+37/-37)
extensions/page-info/Makefile.in (+44/-45)
extensions/page-info/mozilla/Makefile.in (+37/-37)
extensions/permissions/Makefile.in (+42/-39)
extensions/push-scroller/Makefile.in (+42/-39)
extensions/rss/Makefile.in (+45/-45)
extensions/rss/ephy-rss-extension.c (+1/-1)
extensions/sample/Makefile.in (+40/-36)
extensions/select-stylesheet/Makefile.in (+42/-39)
extensions/select-stylesheet/mozilla/Makefile.in (+35/-34)
extensions/smart-bookmarks/Makefile.in (+40/-36)
extensions/soup-fly/Makefile.in (+42/-39)
extensions/soup-fly/ephy-soup-fly-extension.c (+2/-2)
extensions/tab-key-tab-navigate/Makefile.in (+40/-36)
extensions/tab-states/Makefile.in (+40/-36)
help/C/epiphany-extensions.xml (+0/-72)
help/Makefile.in (+17/-11)
help/de/epiphany-extensions.xml (+0/-48)
help/es/epiphany-extensions.xml (+0/-48)
help/fr/epiphany-extensions.xml (+0/-48)
help/oc/epiphany-extensions.xml (+0/-71)
help/sl/epiphany-extensions.xml (+0/-71)
help/sv/epiphany-extensions.xml (+0/-51)
include/Makefile.in (+16/-11)
install-sh (+18/-11)
ltmain.sh (+57/-38)
m4/libtool.m4 (+207/-57)
m4/ltoptions.m4 (+17/-2)
m4/ltversion.m4 (+5/-5)
missing (+4/-49)
po/cs.po (+30/-82)
po/da.po (+97/-150)
po/de.po (+165/-156)
po/es.po (+73/-59)
po/ja.po (+216/-457)
po/sl.po (+158/-145)
To merge this branch: bzr merge lp://qastaging/~l3on/ubuntu/precise/epiphany-extensions/new-release
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+94697@code.qastaging.launchpad.net

Description of the change

New release version.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work, uploaded!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: