From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 7 Jul 2008 16:00:48 +0000 (+0200)
Subject: Merge branch 'ipset'
X-Git-Tag: v1.5.5~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c902893b5145f6b5eb05de081ea636c3b23393c;p=thirdparty%2Fxtables-addons.git

Merge branch 'ipset'
---

1c902893b5145f6b5eb05de081ea636c3b23393c
diff --cc extensions/Kbuild
index 540699b,3f032f6..e5c01e4
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@@ -15,8 -15,7 +15,9 @@@ obj-${build_TEE}     += xt_TEE.
  obj-${build_condition} += xt_condition.o
  obj-${build_geoip}    += xt_geoip.o
  obj-${build_ipp2p}    += xt_ipp2p.o
+ obj-${build_ipset}    += ipset/
  obj-${build_portscan} += xt_portscan.o
 +obj-${build_quota2}    += xt_quota2.o
  
  -include ${M}/*.Kbuild
 +-include ${M}/Kbuild.*
diff --cc mconfig
index a68d4c4,043a8ea..8d8fcdc
--- a/mconfig
+++ b/mconfig
@@@ -10,5 -10,5 +10,6 @@@ build_TEE=
  build_condition=m
  build_geoip=m
  build_ipp2p=m
+ build_ipset=m
  build_portscan=m
 +build_quota2=m