From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 30 Sep 2012 21:34:04 +0000 (+0200)
Subject: Merge branch 'master' of git://git.inai.de/iptables
X-Git-Tag: v1.4.16~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c1a015e201c6e5192448cbcf1975dd7630cad82;p=thirdparty%2Fiptables.git

Merge branch 'master' of git://git.inai.de/iptables

Conflicts:
	extensions/GNUmakefile.in

Resolution: trivial, since this was a fuzz 3.

Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.
---

4c1a015e201c6e5192448cbcf1975dd7630cad82
diff --cc extensions/GNUmakefile.in
index 16390300,2e0921e4..8b38df91
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@@ -77,10 -75,10 +75,10 @@@ install: ${targets_install
  	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
  
  clean:
- 	rm -f *.o *.oo *.so *.a {matches,targets}[46].man initext.c initext4.c initext6.c;
+ 	rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
 +	rm -f .*.d .*.dd;
  
  distclean: clean
 -	rm -f .*.d .*.dd;
  
  init%.o: init%.c
  	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<;