]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e5babb 1835790)
Merge branch 'nft-compat'
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 13 Feb 2014 10:39:48 +0000 (11:39 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 13 Feb 2014 10:39:48 +0000 (11:39 +0100)
This merges the branch that contains the iptables over nftables
compatibility layer into master.


Trivial merge
Mirror of git://git.netfilter.org/iptables