]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8075493 8d14aeb)
Merge branch 'floating/opts' of git://dev.medozas.de/iptables
authorPatrick McHardy <kaber@trash.net>
Thu, 12 May 2011 09:11:51 +0000 (11:11 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 12 May 2011 09:11:51 +0000 (11:11 +0200)
1  2 
extensions/libipt_DNAT.c patch | diff1 | diff2 | blob | history
extensions/libipt_SNAT.c patch | diff1 | diff2 | blob | history
include/xtables.h.in patch | diff1 | diff2 | blob | history

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