summaryrefslogtreecommitdiff
path: root/extra/qemu-kvm
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-13 14:21:34 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-13 14:21:34 -0300
commit4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch)
tree69e20048be17aa12e6342ebcafb0cf9cdbfee32d /extra/qemu-kvm
parent149750d28420a7b59fab5501ab9aaca095f6fa46 (diff)
parentb5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/packagekit/PKGBUILD community/bird/PKGBUILD community/camlp5/PKGBUILD community/exim/PKGBUILD community/ibus-table-extraphrase/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-gcc/PKGBUILD community/torcs/PKGBUILD core/db/PKGBUILD core/iproute2/PKGBUILD core/libsasl/PKGBUILD core/openldap/PKGBUILD core/pam/PKGBUILD core/util-linux/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/ffmpeg/PKGBUILD extra/kdelibs/PKGBUILD extra/libreoffice/PKGBUILD extra/php/PKGBUILD extra/postfix/PKGBUILD extra/python-lxml/PKGBUILD extra/rdesktop/PKGBUILD extra/redland/PKGBUILD extra/subversion/PKGBUILD extra/tidyhtml/PKGBUILD extra/transmission/PKGBUILD extra/windowmaker/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-openssl/PKGBUILD
Diffstat (limited to 'extra/qemu-kvm')
0 files changed, 0 insertions, 0 deletions