diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
| commit | 0982af0e4b5622aaae02f43925fe1152006f878e (patch) | |
| tree | 38f7971d08e822fa0a4ffcb5e432b7da993da497 /community/metapixel | |
| parent | 38389505b5f8809743855ead04f7feb9a37a9cc8 (diff) | |
| parent | 014b5d0a1ee98ba0466f067f605b9637f2a14b2f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nautilus-actions/PKGBUILD
extra/libdrm/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/bind/PKGBUILD
testing/dmraid/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'community/metapixel')
0 files changed, 0 insertions, 0 deletions