summaryrefslogtreecommitdiff
path: root/~fauno
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-12 12:04:42 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-12 12:04:42 -0300
commit57f780f5913e0a1bf9a4f6d8b94309537d99cca7 (patch)
tree78aaeeba5e5fa3267ca815671f11a75b3af11a00 /~fauno
parentd9929db3b4ad2dfeeb19ad71f6016eb8122d0208 (diff)
parentfd4cd23b679e620a51c42e87a0655d55704fdba8 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/bind/PKGBUILD extra/gc/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions