summaryrefslogtreecommitdiff
path: root/~brendan
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-27 12:52:56 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-27 12:52:56 -0300
commit78e579460b6f67a777a72232903eb7eaf84c945f (patch)
tree13403c8933fd3ea439b3d5734a5a3d0d7b04e386 /~brendan
parent45109aea7693acc9077824a431e17110d21ed6b3 (diff)
parentc008601effc878e60852f7928ddadcf5a16eb851 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/spacefm/PKGBUILD extra/eina/PKGBUILD extra/kdeplasma-addons/PKGBUILD
Diffstat (limited to '~brendan')
0 files changed, 0 insertions, 0 deletions