diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-09 09:29:16 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-09 09:29:16 -0300 |
| commit | bf27698570c0232bdabb1f9d4636e13829648264 (patch) | |
| tree | c5f6187b28bd8e011583c4d24979054af2136839 /~fauno | |
| parent | 8b82a3250aa4e181b97e7faeb055a00e718bdadb (diff) | |
| parent | 2b6f5a28e2e55b46c1169228e1e56f3b18dd08b5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/open-vm-tools-modules/PKGBUILD
community/virtualbox/PKGBUILD
core/lilo/PKGBUILD
core/lilo/lilo.conf
core/pam/PKGBUILD
core/syslinux/PKGBUILD
core/syslinux/syslinux.cfg
extra/ethtool/PKGBUILD
extra/libksba/PKGBUILD
extra/lirc/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions