diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-29 11:16:16 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-29 11:16:16 -0300 |
commit | e6cfd7546bf6f69ede45c253e0c130b58f3520ff (patch) | |
tree | 95ed4c7b4ed62c88ca3d9a6a0a7456960ce62645 /extra/xorg-xload/PKGBUILD | |
parent | 8539eba5172b223acd7238f637ca2a6d7e85490f (diff) | |
parent | 5cd3c62bce23c2b25c28b22da71f664b48703ad2 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
testing/binutils/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/linux-api-headers/PKGBUILD
Diffstat (limited to 'extra/xorg-xload/PKGBUILD')
0 files changed, 0 insertions, 0 deletions