diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
| commit | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch) | |
| tree | 452fb18314fb6d4393552d1ef1190a3168353f44 /core/psmisc | |
| parent | bb3524a1ba0370174d0c586ae94cd503b562a207 (diff) | |
| parent | 9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas2/PKGBUILD
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community-staging/pdf2djvu/PKGBUILD
community/dante/PKGBUILD
community/gnunet/PKGBUILD
community/luafilesystem/PKGBUILD
community/luajit/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pygobject/PKGBUILD
extra/pygobject2/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/python/PKGBUILD
extra/vde2/PKGBUILD
gnome-unstable/clutter-gtk/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
staging/kdebase-workspace/PKGBUILD
testing/iputils/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php-fpm.service
testing/php/rc.d.php-fpm
Diffstat (limited to 'core/psmisc')
0 files changed, 0 insertions, 0 deletions