diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 14:04:42 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 18:43:13 +0100 |
| commit | 29fd6a1df9f6c80d155a7a73b8514a68dc9cd22d (patch) | |
| tree | 9dc15a3e19a6ff36ae9ee3d38c7b8190b73f0a72 /src/expr.c | |
| parent | 16871a3615edcf358d688a8d079b1e7b20053fb1 (diff) | |
| parent | 076fd1e66e7f1bc3b2bd91f3efb84080da26fb9c (diff) | |
Merge branch 'master' into next-3.14
This patch includes changes to adapt this branch to the library
rename that happened in the master branch.
Conflicts:
src/Makefile.am
src/expr/cmp.c
src/expr/ct.c
src/expr/data_reg.c
src/expr/meta.c
tests/jsonfiles/01-table.json
tests/jsonfiles/02-table.json
tests/jsonfiles/64-ruleset.json
tests/xmlfiles/01-table.xml
tests/xmlfiles/02-table.xml
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,7 +22,7 @@ #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nf_tables.h> -#include <libnftables/expr.h> +#include <libnftnl/expr.h> #include "linux_list.h" |