[Pkg-mozext-commits] [adblock-plus] 68/74: Merge remote-tracking branch 'adblockplusui/master'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit e74c042f4f890fc1a476da5428a0652eff60a887
Merge: a97bf72 cd832b0
Author: David Prévot <david at tilapin.org>
Date:   Tue Aug 11 11:56:46 2015 +0200

    Merge remote-tracking branch 'adblockplusui/master'

 adblockplusui/README.md                            |   17 +
 adblockplusui/background.js                        |  170 ++-
 adblockplusui/ext/background.js                    |    8 +-
 adblockplusui/firstRun.js                          |   49 +-
 adblockplusui/locale/en-US/options.json            |  326 ++++++
 adblockplusui/locale/nl/firstRun.json              |   22 +-
 adblockplusui/messageResponder.js                  |  227 +++-
 adblockplusui/options.html                         |  370 +++++++
 adblockplusui/options.js                           |  741 +++++++++++++
 adblockplusui/skin/fonts/SourceSansPro-Light.woff  |  Bin 0 -> 17540 bytes
 .../skin/fonts/SourceSansPro-Regular.woff          |  Bin 0 -> 17500 bytes
 .../skin/fonts/SourceSansPro-Semibold.woff         |  Bin 0 -> 17380 bytes
 adblockplusui/skin/options-sprite.png              |  Bin 0 -> 2855 bytes
 adblockplusui/skin/options.css                     | 1086 ++++++++++++++++++++
 adblockplusui/skin/tooltips/acceptable-ads.png     |  Bin 0 -> 569 bytes
 adblockplusui/skin/tooltips/block.png              |  Bin 0 -> 899 bytes
 adblockplusui/skin/tooltips/more.png               |  Bin 0 -> 811 bytes
 adblockplusui/skin/tooltips/whitelisted.png        |  Bin 0 -> 890 bytes
 adblockplusui/subscriptions.xml                    |  139 +++
 19 files changed, 3067 insertions(+), 88 deletions(-)

diff --cc adblockplusui/locale/en-US/options.json
index 0000000,c6c4ccb..c6c4ccb
mode 000000,100644..100644
--- a/adblockplusui/locale/en-US/options.json
+++ b/adblockplusui/locale/en-US/options.json
diff --cc adblockplusui/options.html
index 0000000,acde19b..acde19b
mode 000000,100644..100644
--- a/adblockplusui/options.html
+++ b/adblockplusui/options.html
diff --cc adblockplusui/options.js
index 0000000,2ab5133..2ab5133
mode 000000,100644..100644
--- a/adblockplusui/options.js
+++ b/adblockplusui/options.js
diff --cc adblockplusui/skin/fonts/SourceSansPro-Light.woff
index 0000000,fb26ef3..fb26ef3
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/fonts/SourceSansPro-Regular.woff
index 0000000,dbdec39..dbdec39
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/fonts/SourceSansPro-Semibold.woff
index 0000000,972b5b1..972b5b1
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/options-sprite.png
index 0000000,535e418..535e418
mode 000000,100755..100755
Binary files differ
diff --cc adblockplusui/skin/options.css
index 0000000,b5b3997..b5b3997
mode 000000,100644..100644
--- a/adblockplusui/skin/options.css
+++ b/adblockplusui/skin/options.css
diff --cc adblockplusui/skin/tooltips/acceptable-ads.png
index 0000000,6f0db66..6f0db66
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/tooltips/block.png
index 0000000,f73170b..f73170b
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/tooltips/more.png
index 0000000,886f470..886f470
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/skin/tooltips/whitelisted.png
index 0000000,347561a..347561a
mode 000000,100644..100644
Binary files differ
diff --cc adblockplusui/subscriptions.xml
index 0000000,68ea2a6..68ea2a6
mode 000000,100644..100644
--- a/adblockplusui/subscriptions.xml
+++ b/adblockplusui/subscriptions.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git