summaryrefslogtreecommitdiff
path: root/core/libpipeline
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-07 11:24:34 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-07 11:24:34 -0300
commita607668699d0ed030ac69ed31969dfa266439e38 (patch)
tree5b3e076437e78d8624668454afc1d82750d54c8a /core/libpipeline
parent6b015d22b5b59eddb6e8c40989017d8492ac912c (diff)
parenta4d309341dbcd3c28ee68e818c1d5ef54114adf8 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/libraw/PKGBUILD community-testing/virtualbox-modules/PKGBUILD community-testing/virtualbox-modules/virtualbox-modules.install community-testing/virtualbox/PKGBUILD community-testing/virtualbox/vboxdrv-reference.patch community-testing/virtualbox/virtualbox.install community-testing/vtk/PKGBUILD community/audex/PKGBUILD community/critter/PKGBUILD community/egoboo/PKGBUILD community/fcgiwrap/PKGBUILD community/hping/PKGBUILD community/libesmtp/PKGBUILD community/lockdev/PKGBUILD community/pidgin-musictracker/PKGBUILD community/pidgin-otr/PKGBUILD community/pylibacl/PKGBUILD community/pypanel/PKGBUILD community/rdiff-backup/PKGBUILD community/steghide/PKGBUILD community/tabbed/PKGBUILD community/transset-df/PKGBUILD community/wyrd/PKGBUILD core/openldap/PKGBUILD core/sqlite3/PKGBUILD extra/fltk/PKGBUILD extra/thunar/PKGBUILD extra/xfce4-clipman-plugin/PKGBUILD multilib/lib32-acl/PKGBUILD multilib/lib32-alsa-oss/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/lib32-libmng/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD multilib/lib32-libusb-compat/PKGBUILD multilib/lib32-libusb/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'core/libpipeline')
0 files changed, 0 insertions, 0 deletions