diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-22 23:09:46 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-22 23:09:46 -0300 |
| commit | f87cdf22eb712b5b1c118f768d4ff710fc839403 (patch) | |
| tree | 023ff68dc2d6efdb25a8ab8b182a14b8d6a55889 /cross | |
| parent | 290a8b0dd73569b6b2d9855be9638d3338c566e0 (diff) | |
| parent | 1d9fb21dff6df1679e536ab672edcbbdb4cf3a15 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arp-scan/PKGBUILD
community/curlftpfs/PKGBUILD
community/dtach/PKGBUILD
community/espeakup/PKGBUILD
community/g2sc/PKGBUILD
community/judy/PKGBUILD
community/python-fuse/PKGBUILD
community/sisctrl/PKGBUILD
extra/avahi/PKGBUILD
extra/kdesdk/PKGBUILD
extra/nasm/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
multilib/lib32-pixman/PKGBUILD
testing/xf86-input-synaptics/PKGBUILD
Diffstat (limited to 'cross')
0 files changed, 0 insertions, 0 deletions