From 3b30a3ce7ed16524c5a56af66930a7fc23ad3431 Mon Sep 17 00:00:00 2001
From: mdew <mdew@mdew-desktop>
Date: Thu, 17 Dec 2009 23:51:03 +1300
Subject: [PATCH] main - more optimising v4

---
 iron/adblock-beta.ini                         |  1 -
 opera/urlfilter.ini                           |  1 -
 trunk/fanboy-adblocklist-current-expanded.txt | 41 +++++++++----------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/iron/adblock-beta.ini b/iron/adblock-beta.ini
index 78686d6f4..bac48baba 100644
--- a/iron/adblock-beta.ini
+++ b/iron/adblock-beta.ini
@@ -976,7 +976,6 @@ _webbanner_
 .adnet.de/
 .adverticus.
 .adverticum.
-.affscript.
 .affiliatecash.
 .affiliateer.com/imager.
 .aglocobanners.
diff --git a/opera/urlfilter.ini b/opera/urlfilter.ini
index f9b2bd39d..b706525f6 100644
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@@ -1000,7 +1000,6 @@ http://*net.nuggad.net/*
 *.adnet.de/*
 *.adverticus.*
 *.adverticum.*
-*.affscript.*
 *.affiliatecash.*
 *.affiliateer.com/imager.*
 *.aglocobanners.*
diff --git a/trunk/fanboy-adblocklist-current-expanded.txt b/trunk/fanboy-adblocklist-current-expanded.txt
index 072223309..aa6763653 100644
--- a/trunk/fanboy-adblocklist-current-expanded.txt
+++ b/trunk/fanboy-adblocklist-current-expanded.txt
@@ -972,27 +972,26 @@ _webbanner_
 *.adtechus.*
 *.adsdk.com/*
 *.adrolays.de/*
-*.adru.net/*
-*.advolution.*
-*.adspace*
-*.adhese.be/*
-*.adteractive.*
-*.admeta.*
-*.adisn.com/*
-*.adecn.com/*
-*.adviva.net/*
-*.advg.jp/*
-*.adman.gr/*
-*.admarketplace.*
-*.adsmarket.com/*
-*.adrevolver.*
-*.adserverplus.*
-*.adtrgt.*
-*.adnet.de/*
-*.adverticus.*
-*.adverticum.*
-*.affscript.*
-*.affiliatecash.*
*.affiliateer.com/imager.
+||adru.net^$third-party
+||advolution.de^$third-party
+.adspace
+||adhese.be^$third-party
+||adteractive.com^$third-party
+||admeta.com^$third-party
+||adisn.com^$third-party
+||adecn.com^$third-party
+||adviva.net^$third-party
+.advg.jp/$third-party
+||adman.gr^$third-party
+||admarketplace.net^$third-party
+||adsmarket.com^$third-party
+||adrevolver.com^$third-party
+||adserverplus.com^$third-party
+||adtrgt.com^$third-party
+||adnet.de^$third-party
+||adverticus.de^$third-party
+||adverticum.net^$third-party
+||affiliatecash.de^$third-party
.affiliateer.com/imager.
 ||aglocobanners.com^$third-party
 *.adcontent*
 ||admeld.com^$third-party