]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
projects / thirdparty / nftables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87787ee f930cc5)
Merge remote-tracking branch 'origin/master' into next-3.14
authorPatrick McHardy <kaber@trash.net>
Thu, 9 Jan 2014 18:55:50 +0000 (18:55 +0000)
committerPatrick McHardy <kaber@trash.net>
Thu, 9 Jan 2014 18:55:50 +0000 (18:55 +0000)
1  2 
src/main.c patch | diff1 | diff2 | blob | history

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