summaryrefslogtreecommitdiff
path: root/extra/xpdf
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-01 11:10:31 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-01 11:10:31 -0300
commitf5ed25b75901e05f9933b548c8bbdda654608c32 (patch)
tree37db6969ba4d61e110bab354ab6dc0db64f0a633 /extra/xpdf
parent1200fd46a32625f2ac4b035653cb49c22cce6426 (diff)
parentbc0657f7159d0b01373ecb59afc426b98a172b1e (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/dangerdeep/PKGBUILD community/lsb-release/PKGBUILD community/perl-gtk2-mozembed/PKGBUILD extra/camsource/PKGBUILD extra/gsf-sharp/PKGBUILD extra/muine/PKGBUILD extra/ocfs2-tools/PKGBUILD extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
Diffstat (limited to 'extra/xpdf')
0 files changed, 0 insertions, 0 deletions