]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
projects / thirdparty / iptables.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d637ead 0d70163)
Merge branch 'master' of git://git.inai.de/iptables
authorJan Engelhardt <jengelh@inai.de>
Sun, 30 Sep 2012 09:23:04 +0000 (11:23 +0200)
committerJan Engelhardt <jengelh@inai.de>
Sun, 30 Sep 2012 09:23:04 +0000 (11:23 +0200)
1  2 
extensions/GNUmakefile.in patch | diff1 | diff2 | blob | history
iptables/ip6tables.c patch | diff1 | diff2 | blob | history
iptables/iptables.c patch | diff1 | diff2 | blob | history

diff --cc extensions/GNUmakefile.in
Simple merge
diff --cc iptables/ip6tables.c
Simple merge
diff --cc iptables/iptables.c
Simple merge
Mirror of git://git.netfilter.org/iptables