diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
| commit | 3357db80ffa8a795fb5cdad0fc726470887706b0 (patch) | |
| tree | 461a9d95f958d88aed12f371328b20d87b69323e /community/xdiskusage/PKGBUILD | |
| parent | 1921cc4951557545f38946cbed66431f42af26b4 (diff) | |
| parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-file-path-expand/PKGBUILD
community/perl-file-slurp/PKGBUILD
community/perl-getopt-argvfile/PKGBUILD
community/perl-graphics-colornames/PKGBUILD
community/perl-html-tableextract/PKGBUILD
community/perl-xml-regexp/PKGBUILD
community/perlio-eol/PKGBUILD
community/virtualbox/PKGBUILD
community/xemacs/PKGBUILD
core/gawk/PKGBUILD
extra/bogofilter/PKGBUILD
extra/feh/PKGBUILD
extra/gnome-phone-manager/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/samba/PKGBUILD
extra/squirrelmail/PKGBUILD
extra/subversion/PKGBUILD
extra/vsftpd/PKGBUILD
extra/xawtv/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glib2/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'community/xdiskusage/PKGBUILD')
0 files changed, 0 insertions, 0 deletions