summaryrefslogtreecommitdiff
path: root/extra/xorg-xauth
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-17 14:31:18 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-06-17 14:31:18 -0300
commit545a4c749d49c3fddbc57c157d650b194e2193d8 (patch)
tree7b06384a2d1d1ec07e26eda99bb0016a0540cbfc /extra/xorg-xauth
parent40df5bbde7fc547479b2cede1f3ffb8e268816b3 (diff)
parent1fcb176285908c33aca3b0f5cb703ec098e5440c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: multilib/wine/PKGBUILD multilib/zsnes/PKGBUILD testing/frozen-bubble/PKGBUILD testing/perl-sdl/PKGBUILD
Diffstat (limited to 'extra/xorg-xauth')
0 files changed, 0 insertions, 0 deletions