]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
projects / thirdparty / nftables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4881965 4097ad7)
Merge remote-tracking branch 'origin/master' into next-3.14
authorPatrick McHardy <kaber@trash.net>
Fri, 10 Jan 2014 12:26:35 +0000 (12:26 +0000)
committerPatrick McHardy <kaber@trash.net>
Fri, 10 Jan 2014 12:26:35 +0000 (12:26 +0000)
1  2 
src/datatype.c patch | diff1 | diff2 | blob | history
src/main.c patch | diff1 | diff2 | blob | history

diff --cc src/datatype.c
Simple merge
diff --cc src/main.c
Simple merge
Mirror of git://git.netfilter.org/nftables