diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
| commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
| tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /core/psmisc | |
| parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
| parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'core/psmisc')
0 files changed, 0 insertions, 0 deletions