Merge branch 'ipset-6'

Conflicts:
	INSTALL
	mconfig
This commit is contained in:
Jan Engelhardt
2011-04-11 04:23:18 +02:00
80 changed files with 1446 additions and 1621 deletions

View File

@@ -84,6 +84,6 @@ AC_SUBST([kbuilddir])
AC_SUBST([xtlibdir])
AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile
extensions/Makefile extensions/ACCOUNT/Makefile
extensions/ipset-4/Makefile extensions/ipset-5/Makefile
extensions/ipset-4/Makefile extensions/ipset-6/Makefile
extensions/pknock/Makefile])
AC_OUTPUT