summaryrefslogtreecommitdiff
path: root/core/dmraid/dmraid_hook
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-20 20:05:58 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-09-20 20:05:58 -0300
commit1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch)
treea9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /core/dmraid/dmraid_hook
parent5a05be089c68617c86c9c555e63f2b0314451ebf (diff)
parent005a14f92ef5d35e4c47d970cb7e69367a835958 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/balsa/PKGBUILD community/bitcoin/PKGBUILD community/jack2/PKGBUILD community/kadu/PKGBUILD community/oss/PKGBUILD core/sudo/PKGBUILD extra/djvulibre/PKGBUILD extra/gtk2/PKGBUILD extra/kdenetwork/PKGBUILD extra/samba/PKGBUILD gnome-unstable/at-spi2-atk/PKGBUILD gnome-unstable/at-spi2-core/PKGBUILD gnome-unstable/glib-networking/PKGBUILD gnome-unstable/glib2/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD libre/kdenetwork-kopete-libre/PKGBUILD multilib/jack2-multilib/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-sdl/PKGBUILD multilib/wine/PKGBUILD multilib/zsnes/PKGBUILD testing/btrfs-progs/PKGBUILD testing/dnsutils/PKGBUILD testing/man-db/PKGBUILD testing/postgresql/PKGBUILD testing/postgresql/postgresql.install testing/postgresql/postgresql.service testing/procps-ng/PKGBUILD testing/procps-ng/sysctl.conf testing/sudo/PKGBUILD testing/xf86-video-nouveau/PKGBUILD testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'core/dmraid/dmraid_hook')
0 files changed, 0 insertions, 0 deletions