diff options
author | Andrew Manison <amanison@anselsystems.com> | 2012-01-07 06:07:55 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2012-01-07 06:07:55 +0000 |
commit | e2901940d45d4e52920f9ebdfc0806c400dcda00 (patch) | |
tree | 5dfbe1d547b2845e2ecb58ffd13561405650ae5e /main/iaxmodem/APKBUILD | |
parent | bbcfe6f7780c9ace7c617aedcc65a6c126b576bb (diff) | |
parent | 5c7467518a3e5e9a07977bef1112c773bcd17a9c (diff) | |
download | aports-e2901940d45d4e52920f9ebdfc0806c400dcda00.tar.bz2 aports-e2901940d45d4e52920f9ebdfc0806c400dcda00.tar.xz |
Merge remote-tracking branch 'alpine/master'
Conflicts:
main/rrdtool/APKBUILD
testing/nfdump/APKBUILD
Diffstat (limited to 'main/iaxmodem/APKBUILD')
0 files changed, 0 insertions, 0 deletions