]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e39f367 1f2474a)
Merge branch 'floating/opts' of git://dev.medozas.de/iptables
authorPatrick McHardy <kaber@trash.net>
Mon, 18 Apr 2011 13:03:22 +0000 (15:03 +0200)
committerPatrick McHardy <kaber@trash.net>
Mon, 18 Apr 2011 13:03:22 +0000 (15:03 +0200)
1  2 
include/xtables.h.in patch | diff1 | diff2 | blob | history

diff --cc include/xtables.h.in
Simple merge
Mirror of git://git.netfilter.org/iptables