diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
| commit | 2352f09f581b24fa01f022026728acf919c0335a (patch) | |
| tree | 36667ad9212b04db2500f304da5ac4a611cce5c9 /extra/prison | |
| parent | 7e9d319e9575e68d86463b792425fcdba0f195d2 (diff) | |
| parent | 99746708edfd2c56f2ba654a14f27e98b1601a43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/luminancehdr/PKGBUILD
community-staging/luxrays/PKGBUILD
community-staging/luxrender/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/widelands/PKGBUILD
community/chmsee/PKGBUILD
community/flac123/PKGBUILD
community/pam-krb5/PKGBUILD
community/python-pyxattr/PKGBUILD
extra/postgresql/PKGBUILD
extra/pygobject2/PKGBUILD
extra/python-lxml/PKGBUILD
extra/usbview/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/bzflag/PKGBUILD
staging/calligra/PKGBUILD
staging/enblend-enfuse/PKGBUILD
staging/gegl/PKGBUILD
staging/hugin/PKGBUILD
staging/inkscape/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/btrfs-progs/initcpio-hook-btrfs
testing/btrfs-progs/initcpio-install-btrfs
testing/cryptsetup/PKGBUILD
testing/cryptsetup/encrypt_hook
testing/empathy/PKGBUILD
testing/evolution/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkglext/PKGBUILD
testing/ibus/PKGBUILD
testing/kmod/PKGBUILD
testing/udisks2/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/prison')
0 files changed, 0 insertions, 0 deletions