diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
| commit | a9a4a92d8375d35e09a3cf9d50921d8839d7c79a (patch) | |
| tree | 1217e2a328639b657e0093610164110a3f65a7d5 /extra/systemd | |
| parent | 61594aa2e82bf07473dce9134553b757b618d9ae (diff) | |
| parent | cf507a0dbf5ee8258e49256049b420ac8e191387 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xf86-video-siliconmotion/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
multilib-testing/libtool-multilib/PKGBUILD
testing/gcc/PKGBUILD
testing/gcc/gcc_pure64.patch
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-vfprintf-nargs.patch
testing/krb5/PKGBUILD
testing/libtool/PKGBUILD
Diffstat (limited to 'extra/systemd')
0 files changed, 0 insertions, 0 deletions