diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /community/blobby2 | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'community/blobby2')
0 files changed, 0 insertions, 0 deletions