]> git.ipfire.org Git - thirdparty/iptables.git/commit
projects / thirdparty / iptables.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 482c6d3 76e230e)
Merge branch 'stable-1.4.20'
authorFlorian Westphal <fw@strlen.de>
Sat, 23 Nov 2013 22:50:17 +0000 (23:50 +0100)
committerFlorian Westphal <fw@strlen.de>
Sat, 23 Nov 2013 22:50:17 +0000 (23:50 +0100)
commit73dcee35a394b0fcf83f99d278bc03515de07d4b
treec7adf02dcfeceb736ff151ab029f82670eec361etree | snapshot
parent482c6d3731e2681cb4baae835c294840300197e6commit | diff
parent76e230e41947576efb96e86e605bb84015cdb287commit | diff
Merge branch 'stable-1.4.20'

... to get 76e230e ('iptables: link against libnetfilter_conntrack'),
else static build doesn't work.

Conflicts:
extensions/GNUmakefile.in

[ CPPFLAGS was added in master, so keep it ]

Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar>
extensions/GNUmakefile.in diff1 | diff2 | blob | history
Mirror of git://git.netfilter.org/iptables