summaryrefslogtreecommitdiff
path: root/community-testing/pcsclite/PKGBUILD
AgeCommit message (Collapse)Author
2012-06-02Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-testing/perl-berkeleydb/PKGBUILD community/egoboo/PKGBUILD community/kdenlive/PKGBUILD community/postgis/PKGBUILD core/lvm2/PKGBUILD extra/gvfs/PKGBUILD extra/libatasmart/PKGBUILD extra/mesa/PKGBUILD extra/pixman/PKGBUILD extra/pulseaudio/PKGBUILD extra/system-config-printer/PKGBUILD extra/xorg-server/PKGBUILD kde-unstable/kdenetwork/PKGBUILD multilib/lib32-mesa/PKGBUILD testing/imagemagick/PKGBUILD testing/php/PKGBUILD testing/php/logrotate.d.php-fpm testing/php/php-fpm.conf.in.patch testing/php/rc.d.php-fpm testing/xf86-video-intel/PKGBUILD
2012-05-28Mon May 28 17:43:57 UTC 2012root