Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock into legacyui

This commit is contained in:
gorhill 2015-06-17 13:50:13 -04:00
parent aeeaa4d5b3 0b379e9685
commit 1d64d31e57
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/checksums.txt
View File

@ -1,6 +1,7 @@
e4f629777323476e7feeb4ecf301da3e assets/ublock/unbreak.txt e4f629777323476e7feeb4ecf301da3e assets/ublock/unbreak.txt
b8fd6f6a836d34e0629dca07424d7bd8 assets/ublock/privacy.txt b8fd6f6a836d34e0629dca07424d7bd8 assets/ublock/privacy.txt
f503959c9fc16cbe37cff30f448000f7 assets/ublock/filters.txt f503959c9fc16cbe37cff30f448000f7 assets/ublock/filters.txt
79d3889e1fdf7bc306523d0d2bd1ee41 assets/ublock/badware.txt
c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt
343afa7da2abf47c258355815f732ce4 assets/ublock/filter-lists.json 343afa7da2abf47c258355815f732ce4 assets/ublock/filter-lists.json
94c0a3eab74c42783855f07b22a429cf assets/thirdparties/home.fredfiber.no/langsholt/adblock.txt 94c0a3eab74c42783855f07b22a429cf assets/thirdparties/home.fredfiber.no/langsholt/adblock.txt

2
platform/chromium/manifest.json
View File

@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "uBlock Origin", "name": "uBlock Origin",
"version": "0.9.9.1", "version": "0.9.9.2",
"default_locale": "en", "default_locale": "en",
"description": "__MSG_extShortDesc__", "description": "__MSG_extShortDesc__",

2
platform/opera/manifest.json
View File

@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "uBlock Origin", "name": "uBlock Origin",
"version": "0.9.9.1", "version": "0.9.9.2",
"default_locale": "en", "default_locale": "en",
"description": "__MSG_extShortDesc__", "description": "__MSG_extShortDesc__",

2
src/js/background.js
View File

@ -129,7 +129,7 @@ return {
group: 'default' group: 'default'
}, },
'assets/ublock/badware.txt': { 'assets/ublock/badware.txt': {
title: 'uBlock filters – Adware/crapware risks', title: 'uBlock filters – Badware risks',
group: 'default' group: 'default'
} }
}, },