summaryrefslogtreecommitdiffstats
path: root/testing/qemu
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2013-03-19 13:30:59 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2013-03-19 13:30:59 +0000
commit616c27899aab6b01a62446f7926277eb6db3cec6 (patch)
treef6b9ce3d33e7acd3fe34422e7298deb791f4e876 /testing/qemu
parent4917bfdb2896048d4ef634d7f12841cc7835b4de (diff)
parent7e618390d4ba971927b8052fd4c5e22796e2ce4a (diff)
downloadaports-fcolista-master.tar.bz2
aports-fcolista-master.tar.xz
Merge git://dev.alpinelinux.org/aportsHEADmaster
Conflicts: main/ffmpeg/APKBUILD
Diffstat (limited to 'testing/qemu')
0 files changed, 0 insertions, 0 deletions