diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
commit | 38e7e59a562c5f8ea83719e4dfd5cd4c9917d5b1 (patch) | |
tree | 8097f94554cc6e2c64d19db24e56e70e041e7757 /pcr/mesa-git | |
parent | 328b5407de9f088d32c429b1b37f6efde3da06f8 (diff) | |
parent | 7d3e94229ca9849421d263542eb2c61f64a91c10 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/gmic/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.systemd
community/linux-tools/usbipd.service
community/macchanger/PKGBUILD
community/ndisc6/PKGBUILD
community/nemiver/PKGBUILD
core/gpgme/PKGBUILD
extra/amarok/PKGBUILD
extra/java-commons-daemon/PKGBUILD
extra/libao/PKGBUILD
extra/liblastfm/PKGBUILD
Diffstat (limited to 'pcr/mesa-git')
0 files changed, 0 insertions, 0 deletions