summaryrefslogtreecommitdiff
path: root/extra/libart-lgpl
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
commit8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch)
treefc12914f9d27317b3d3f1df6f0009f02ebb7668a /extra/libart-lgpl
parent40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff)
parentd915cad658736d96368750201c34df752048751a (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
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
Diffstat (limited to 'extra/libart-lgpl')
0 files changed, 0 insertions, 0 deletions