summaryrefslogtreecommitdiff
path: root/extra/pygobject
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-05 03:33:25 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-05 03:33:25 -0300
commitfa8be7b03b46e65b64d710cbfae7ba4a93751a57 (patch)
tree485f4f134233af2f3d63b9dcf9e97506467a74b9 /extra/pygobject
parentaced7a6b55bc695c39eb6482b254829f0b56ff4b (diff)
parenta7f79fc1ced18c586d320033ac9738e98a21b550 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: core/expat/PKGBUILD core/gcc/PKGBUILD core/glibc/PKGBUILD core/libtool/PKGBUILD core/wpa_actiond/PKGBUILD libre/linux-libre/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/gcc-multilib/gcc_pure64-multilib.patch multilib/lib32-glibc/PKGBUILD multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch multilib/lib32-glibc/glibc-__i686.patch multilib/libtool-multilib/PKGBUILD staging/kdebase-workspace/PKGBUILD staging/kdepim-runtime/PKGBUILD testing/telepathy-gabble/PKGBUILD testing/telepathy-glib/PKGBUILD testing/telepathy-mission-control/PKGBUILD
Diffstat (limited to 'extra/pygobject')
0 files changed, 0 insertions, 0 deletions