diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-12 04:09:52 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-12 04:09:52 -0300 |
| commit | 2c721caa534df76621bf07705ed0ea80efe44f8b (patch) | |
| tree | 7dac47c69e19cd2b978f154e9618e074b7410658 /community/slock | |
| parent | 020644b613452cc7ab48474b463e4a9d1088d8a3 (diff) | |
| parent | cfceb92e73d7f6a32494f0ba258b98748af43f34 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aircrack-ng/PKGBUILD
community/geos/PKGBUILD
extra/v4l-utils/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
staging/libxi/PKGBUILD
staging/mesa/PKGBUILD
staging/xorg-server/PKGBUILD
staging/xorg-server/autoconfig-nvidia.patch
testing/kmod/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice.install
testing/systemd/PKGBUILD
Diffstat (limited to 'community/slock')
0 files changed, 0 insertions, 0 deletions