massive new merge

This commit is contained in:
mdew 2009-12-23 00:06:07 +13:00
parent 249279ab63
commit 72db62cc28
4 changed files with 42 additions and 78 deletions

View File

@ -2892,55 +2892,42 @@ _300x250-
@@.rp-dev.com/wp-content/*300x300*
@@|http://www.empireonline.com.au*/300x250/*$image
! International Sites
*.hypernews.ru/*
*.ebayrtm.com/rtm?RtmCmd&a=json*&c=1*
*.espoluprace.cz/affiliate/*
*.eweek.com/images/stories/Marketing/*
*.funpic.de/layer.php*
*.geldrace.nl/*
*.gonamic.de/*
*.grafstat.ro/*
*.keymedia.hu/*
||forced-layer.de/*
*.jobzonen.dk/external/*
*.jouwpagina.nl/*
*.juiceadv.*
*.klikeuro.nl/*
*.klicksponsor.de/*
*.kaskus.us/banner/*
*.beweb.com/*
*.clickintext.*
*.ligatus.de/*
*.linkbucks.com/Frame.aspx?*
*.mediarotator.ru/*
*.medialand.ru/*
*.metriweb.be/*
*.moneymakers.de/*
*.mytemplatestorage.*
*.megaban.com.ua/*
*.netdirect.nl/*
*.netshelter.net/serve.cgi?*
*.novatris.com/*
*.nytimes.com/iFrame/DirM.asp
*.imedia.co.il/*
*.ias.rakuten.*
*.itvnews.tv/images/flash/*
*.magnet.kiev.ua/*
*.magna.ru/partner/*
*.mirando.de/*
*.lbs.km.ru/*
*.link.ru/*
*.linkads.de/*
*.publipagos.*
*.tumri.net/*
*.realmatch.com/Widgets/*
*.rbcmedia.ru/*
*.rclick.com.ua/*
*.sitepoint.com/popup/*
*.superclix.de/*
*.webads.nl/*
*.top.list.ru/*
*.getprice.com.au/searchwidget.*
||hypernews.ru^$third-party
||ebayrtm.com/rtm?RtmCmd&a=json*&c=1
||eweek.com/images/stories/Marketing/
||funpic.de/layer.php
||gonamic.de^$third-party
||grafstat.ro^$third-party
||keymedia.hu^$third-party
||forced-layer.de^$third-party
||jobzonen.dk/external/
||juiceadv.com^$third-party
||klicksponsor.de^$third-party
||kaskus.us/banner/
||clickintext.com^$third-party
||ligatus.de^$third-party
||linkbucks.com/Frame.aspx?
||mediarotator.ru^$third-party
||medialand.ru^$third-party
||metriweb.be^$third-party
||megaban.com.ua^$third-party
||netdirect.nl^$third-party
||netshelter.net^$third-party
||imedia.co.il^$third-party
||magnet.kiev.ua^$third-party
||partner.magna.ru^$third-party
||goodadvert.ru^$third-party
||mirando.de^$third-party
||lbs.km.ru^$third-party
||link.link.ru^$third-party
||linkads.de^$third-party
||tumri.net^$third-party
||realmatch.com/Widgets/
||pics.rbc.ru^$third-party
||superclix.de^$third-party
||webads.nl^$third-party
||top.list.ru^$third-party
||getprice.com.au^$third-party
*.trafficgate.*
*.usemax.de/*
*.vietad.vn/*
@ -4980,6 +4967,7 @@ silverlight.net##.banner_header
simplyhired.com##.featured.results
siteadvisor.com##.midPageSmallOuterDiv
siteadvisor.com##[style="border: 1px solid rgb(238, 238, 238); padding: 3px; float: right; color: rgb(221, 221, 221);"]
sitepoint.com###banner
sixrevisions.com##.sponsors
slashdot.org###fad1
slashdot.org##.ad2

View File

@ -165,7 +165,6 @@
.mm7.net/
.msn.com/ro.aspx?
.myspace.com/isf.gif?
.mystat-in.net/
.nedstatbasic.net/
.net/ping.php?
.net/trck/
@ -1201,6 +1200,7 @@ webstatisztika
||mvtracker.com^$third-party
||mycounter.ua^$third-party
||myreferer.com^$third-party
||mystat-in.net^$third-party
||mystats.nl^$third-party
||navrcholu.cz^$third-party
||netavenir.com^$third-party

View File

@ -4144,8 +4144,8 @@ size=468x60
.eweek.com/images/stories/Marketing/
.funpic.de/layer.php
.gamecopyworld.com/games/!_
.geldrace.nl/
.gonamic.de/
.goodadvert.ru/
.grafstat.ro/
.hotlog.ru/
.html?wpl=
@ -4156,11 +4156,8 @@ size=468x60
.jetrun.jp/
.jobzonen.dk/external/
.rssad.jp/
.jouwpagina.nl/
.juiceadv.
.jpassport.jp/
.klikeuro.nl/
.beweb.com/
.clickintext.
.ligatus.de/
.linkbucks.com/Frame.aspx?
@ -4168,18 +4165,12 @@ size=468x60
.mediarotator.ru/
.medialand.ru/
.metriweb.be/
.moneymakers.de/
.mytemplatestorage.
.megaban.com.ua/
.netdirect.nl/
.netshelter.net/serve.cgi?
.newzfind.com/ads/
.novatris.com/
.nytimes.com/iFrame/DirM.asp
.imedia.co.il/
.infoseek.co.jp/isweb/
.ias.rakuten.
.itvnews.tv/images/flash/
.ivwbox.de/
.magnet.kiev.ua/
.mirando.de/
@ -4191,15 +4182,11 @@ size=468x60
.klicksponsor.de/
.kaskus.us/banner/
.keymedia.hu/
.publipagos.
.siteadvisor.com/images/
.ticketsnow.com/PromotionalContent/
.ticketmaster.com/PromotionalContent/
.tumri.net/
.realmatch.com/Widgets/
.rbcmedia.ru/
.rclick.com.ua/
.sitepoint.com/popup/
.superclix.de/
.webads.nl/
.top.list.ru/
@ -4222,6 +4209,7 @@ http://blogvertising.pl/
.oper.ru/data/rennabs/
http://direct.quasir.
http://d1.sina.com.cn/
http://pics.rbc.ru/
http://images.rambler.
http://info.clipta.com/informer/?
/altClickToSearch.js

View File

@ -4235,8 +4235,8 @@ http://ads.*=728x90&*
*.eweek.com/images/stories/Marketing/*
*.funpic.de/layer.php*
*.gamecopyworld.com/games/!_*
*.geldrace.nl/*
*.gonamic.de/*
*.goodadvert.ru/*
*.grafstat.ro/*
*.ibtimes.com/banner/*
*.keymedia.hu/*
@ -4244,13 +4244,10 @@ http://ads.*=728x90&*
*.jetrun.jp/*
*.jobzonen.dk/external/*
*.rssad.jp/*
*.jouwpagina.nl/*
*.juiceadv.*
*.jpassport.jp/*
*.klikeuro.nl/*
*.klicksponsor.de/*
*.kaskus.us/banner/*
*.beweb.com/*
*.clickintext.*
*.giganews.com/banners/*
*.ligatus.de/*
@ -4258,17 +4255,11 @@ http://ads.*=728x90&*
*.mediarotator.ru/*
*.medialand.ru/*
*.metriweb.be/*
*.moneymakers.de/*
*.mytemplatestorage.*
*.megaban.com.ua/*
*.netdirect.nl/*
*.netshelter.net/serve.cgi?*
*.novatris.com/*
*.nytimes.com/iFrame/DirM.asp
*.imedia.co.il/*
*.infoseek.co.jp/isweb/*
*.ias.rakuten.*
*.itvnews.tv/images/flash/*
*.ivwbox.de/*
*.magnet.kiev.ua/*
*.magna.ru/partner/*
@ -4278,15 +4269,11 @@ http://ads.*=728x90&*
*.indianpad.com/promos/*
*.indianpad.com/user_promos/*
*.linkads.de/*
*.publipagos.*
*.ps3news.com/banners/*
*.ticketmaster.com/PromotionalContent/*
*.ticketsnow.com/PromotionalContent/*
*.tumri.net/*
*.realmatch.com/Widgets/*
*.rbcmedia.ru/*
*.rclick.com.ua/*
*.sitepoint.com/popup/*
*.superclix.de/*
*.webads.nl/*
*.top.list.ru/*
@ -4324,6 +4311,7 @@ http://ads.*=728x90&*
*/media-click.ru/*
*/mosnews.com/banners/*
*/mixmarket.biz/show/*
*/pics.rbc.ru/*
*/rb.rfn.ru/*
*_pricegrabber_small.php?*
*/sher.index.hu/*