Delta Between Two Patch Sets: subscriptions.xml
Issue 6088024630755328:
issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)
Left Patch Set:
Created March 6, 2015, 11:44 a.m.
Right Patch Set: Comment about solution being temprorary is added to subscriptions.xml
Created June 13, 2015, 12:59 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« skin/options-sprite.png ('k')
|
no next file »
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0"?> | 1 <?xml version="1.0"?> |
| 2 | 2 |
| 3 <!-- | 3 <!-- |
| 4 - This file is part of the Adblock Plus web scripts, | 4 - This file is part of the Adblock Plus web scripts, |
| 5 - Copyright (C) 2006-2015 Eyeo GmbH | 5 - Copyright (C) 2006-2015 Eyeo GmbH |
| 6 - | 6 - |
| 7 - Adblock Plus is free software: you can redistribute it and/or modify | 7 - Adblock Plus is free software: you can redistribute it and/or modify |
| 8 - it under the terms of the GNU General Public License version 3 as | 8 - it under the terms of the GNU General Public License version 3 as |
| 9 - published by the Free Software Foundation. | 9 - published by the Free Software Foundation. |
| 10 - | 10 - |
| 11 - Adblock Plus is distributed in the hope that it will be useful, | 11 - Adblock Plus is distributed in the hope that it will be useful, |
| 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 - GNU General Public License for more details. | 14 - GNU General Public License for more details. |
| 15 - | 15 - |
| 16 - You should have received a copy of the GNU General Public License | 16 - You should have received a copy of the GNU General Public License |
| 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 18 --> | |
| 19 | |
| 20 <!-- | |
| 21 Bundling current file in adblockplusui repository is just a temprorary | |
| 22 solution until #2677 is fixed | |
| 18 --> | 23 --> |
| 19 | 24 |
| 20 <subscriptions> | 25 <subscriptions> |
| 21 <subscription title="EasyList" | 26 <subscription title="EasyList" |
| 22 specialization="English" | 27 specialization="English" |
| 23 url="https://easylist-downloads.adblockplus.org/easylist.txt" | 28 url="https://easylist-downloads.adblockplus.org/easylist.txt" |
| 24 homepage="https://easylist.adblockplus.org/" | 29 homepage="https://easylist.adblockplus.org/" |
| 25 prefixes="en" | 30 prefixes="en" |
| 26 author="fanboy, MonztA, Famlam, Khrin"/> | 31 author="fanboy, MonztA, Famlam, Khrin"/> |
| 27 <subscription title="ABPindo+EasyList" | 32 <subscription title="ABPindo+EasyList" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 specialization="Prebake" | 142 specialization="Prebake" |
| 138 url="https://raw.githubusercontent.com/liamja/Prebake/master/obt rusive.txt" | 143 url="https://raw.githubusercontent.com/liamja/Prebake/master/obt rusive.txt" |
| 139 homepage="http://liamja.github.io/Prebake/" | 144 homepage="http://liamja.github.io/Prebake/" |
| 140 popular="true"/> | 145 popular="true"/> |
| 141 <subscription title="Spam404" | 146 <subscription title="Spam404" |
| 142 specialization="Spam404" | 147 specialization="Spam404" |
| 143 url="https://spam404bl.com/spam404scamlist.txt" | 148 url="https://spam404bl.com/spam404scamlist.txt" |
| 144 homepage="http://www.spam404.com/" | 149 homepage="http://www.spam404.com/" |
| 145 popular="true"/> | 150 popular="true"/> |
| 146 </subscriptions> | 151 </subscriptions> |
| LEFT | RIGHT |
« skin/options-sprite.png ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
