summaryrefslogtreecommitdiff
path: root/core/iptables
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-20 11:41:05 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-20 11:41:05 -0300
commit0d18015803bebeb58911bf791653597291056095 (patch)
treedf21e7972fd9d4555942dbad0bde22066ebf95f3 /core/iptables
parent2f352ca8b911d96566b10adc049f76a552ab93aa (diff)
parent3da6b13f1eb136d0899bd2e8dd217048bb4d9030 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/keysafe/PKGBUILD community/lesspipe/PKGBUILD community/xchat-systray-integration/PKGBUILD core/gen-init-cpio/PKGBUILD extra/xarchiver/PKGBUILD
Diffstat (limited to 'core/iptables')
0 files changed, 0 insertions, 0 deletions