summaryrefslogtreecommitdiff
path: root/~xihh
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-30 12:20:50 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-30 12:20:50 -0300
commitf945a6a14843dcca046e22f28d0cb0ca75fe27de (patch)
tree128fd26fe2a604e6f5d3d6105da06610332d524a /~xihh
parent14995c4581e56e6540a9c89074623e73b9f1fc49 (diff)
parentdba5b0127d9f00a13c489f0f5893481cbe7d429b (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/avifile/PKGBUILD community/drbd/PKGBUILD extra/feh/PKGBUILD extra/samba/PKGBUILD libre/syslinux/PKGBUILD social/batctl/PKGBUILD
Diffstat (limited to '~xihh')
0 files changed, 0 insertions, 0 deletions