diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
| commit | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (patch) | |
| tree | 2d5fd72b25008b56e2121bb35665ebeaebd50140 /extra/libwps | |
| parent | d84e7e621b059d11c483d6864cb1a549572d1821 (diff) | |
| parent | 139460a7a8b085588b699c488fd19b166db18a74 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/logrotate/PKGBUILD
extra/hwloc/PKGBUILD
extra/kdeutils/PKGBUILD
extra/lapack/PKGBUILD
extra/openmpi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mesa/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/libwps')
0 files changed, 0 insertions, 0 deletions