aboutsummaryrefslogtreecommitdiffstats
path: root/testing/knock
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2011-03-02 09:26:20 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2011-03-02 09:26:20 +0000
commit4f3272dc611e81b5c37a9c34ab63b82d9c6a2317 (patch)
treeaf239468db01648e0336249d73071a210560b11d /testing/knock
parenta3b37bc56a794d671a61ef4bfd177840d94ec2f8 (diff)
parent32c855584083dff4152ac2314ef0838b7019f2e6 (diff)
downloadaports-4f3272dc611e81b5c37a9c34ab63b82d9c6a2317.tar.bz2
aports-4f3272dc611e81b5c37a9c34ab63b82d9c6a2317.tar.xz
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/fcolista/aports
Conflicts: testing/expect/APKBUILD testing/ngrep/APKBUILD testing/openvcp/APKBUILD testing/perl-php-serialization/APKBUILD testing/perl-sys-mmap/APKBUILD testing/qpage/APKBUILD
Diffstat (limited to 'testing/knock')
0 files changed, 0 insertions, 0 deletions