]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 510e066 71a2b0c)
Merge branch 'stable-1.4.20'
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 8 Aug 2013 10:37:31 +0000 (12:37 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 8 Aug 2013 10:37:31 +0000 (12:37 +0200)
To retrieve:

iptables: correctly reference generated file

1  2 
iptables/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc iptables/Makefile.am
Simple merge
Mirror of git://git.netfilter.org/iptables