summaryrefslogtreecommitdiffstats
path: root/src/cli.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-08-18 01:07:24 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-08-18 01:10:04 +0200
commit94002b41384890224bfb14d1b0986bd8b279b17e (patch)
tree98183db74a84036831c6c626df993eaa48e5025c /src/cli.c
parentecf855b2f58f1718a6a1c3dcde13b140557844ec (diff)
parent6c43069e5f2a55d769ec6d362bc863af906591d0 (diff)
Merge branch 'next-4.2'
This branch adds support for the new 'netdev' family. This also resolves a simple conflict with the default chain policy printing. Conflicts: src/rule.c Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/cli.c')
0 files changed, 0 insertions, 0 deletions