diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
| commit | aa59a87bb8860445bb3a4b233b44812b65b8c363 (patch) | |
| tree | 2c86c94b07d2205834540b0d4c8ead7f264f56d5 /core/cryptsetup | |
| parent | eca1d6fadc95df0eab55f607f67e69ff5329f590 (diff) | |
| parent | 120df4e0db159525806a9b33364483e76f9d51d3 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/catalyst-dkms/PKGBUILD
community-testing/catalyst-dkms/catalyst.install
community-testing/lxdm/PKGBUILD
community-testing/lxdm/lxdm-pam
extra/tdb/PKGBUILD
extra/usbview/PKGBUILD
multilib/lib32-libldap/PKGBUILD
testing/bison/PKGBUILD
testing/ekiga/PKGBUILD
testing/evince/PKGBUILD
testing/gthumb/PKGBUILD
testing/nautilus/PKGBUILD
testing/opal/PKGBUILD
testing/opal/opal-ffmpeg.patch
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/openssh/sshdgenkeys.service
testing/yelp/PKGBUILD
Diffstat (limited to 'core/cryptsetup')
0 files changed, 0 insertions, 0 deletions