]> git.ipfire.org Git - thirdparty/iptables.git/commit
projects / thirdparty / iptables.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec40b89 7b5ba43)
Merge branch 'master' of git://git.inai.de/iptables
authorJan Engelhardt <jengelh@inai.de>
Sun, 30 Sep 2012 21:34:04 +0000 (23:34 +0200)
committerJan Engelhardt <jengelh@inai.de>
Sun, 30 Sep 2012 21:38:58 +0000 (23:38 +0200)
commit4c1a015e201c6e5192448cbcf1975dd7630cad82
tree30ee606da82b0cbcb11ebb303196afb29f4e65e7tree | snapshot
parentec40b897289745da3d67de2cb14be30353003922commit | diff
parent7b5ba43ae48c1310e5a615cf9485c1d42f486467commit | diff
Merge branch 'master' of git://git.inai.de/iptables

Conflicts:
extensions/GNUmakefile.in

Resolution: trivial, since this was a fuzz 3.

Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.
extensions/GNUmakefile.in diff1 | diff2 | blob | history
Mirror of git://git.netfilter.org/iptables