]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
projects / thirdparty / nftables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 807b936 6d0a165)
Merge remote-tracking branch 'origin/master' into next-3.14
authorPatrick McHardy <kaber@trash.net>
Mon, 20 Jan 2014 13:38:40 +0000 (13:38 +0000)
committerPatrick McHardy <kaber@trash.net>
Mon, 20 Jan 2014 13:38:40 +0000 (13:38 +0000)
1  2 
src/datatype.c patch | diff1 | diff2 | blob | history

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