summaryrefslogtreecommitdiff
path: root/~mtjm/python-urlreader
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-10 10:21:53 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-10 10:21:53 -0300
commit9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (patch)
treea9c2e47a6d2ce00fda6c302e09aba390accc1407 /~mtjm/python-urlreader
parent96790e4d7e2c3a76ee2ee0c5d703b8144049532c (diff)
parent4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/blender/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/root/PKGBUILD community-testing/ted/PKGBUILD extra/cpufrequtils/PKGBUILD extra/libraw1394/PKGBUILD extra/musicbrainz/PKGBUILD extra/pm-utils/PKGBUILD extra/re2c/PKGBUILD extra/zip/PKGBUILD multilib/lib32-expat/PKGBUILD multilib/lib32-flac/PKGBUILD multilib/lib32-fontconfig/PKGBUILD multilib/lib32-giflib/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-glib/PKGBUILD multilib/lib32-json-c/PKGBUILD multilib/lib32-lcms/PKGBUILD multilib/lib32-libao/PKGBUILD multilib/lib32-libasyncns/PKGBUILD multilib/lib32-libcups/PKGBUILD multilib/lib32-libice/PKGBUILD multilib/lib32-libmikmod/PKGBUILD multilib/lib32-libsm/PKGBUILD multilib/lib32-libsndfile/PKGBUILD multilib/lib32-libstdc++5/PKGBUILD multilib/lib32-libvorbis/PKGBUILD multilib/lib32-libxau/PKGBUILD multilib/lib32-libxcomposite/PKGBUILD multilib/lib32-libxdamage/PKGBUILD multilib/lib32-libxdmcp/PKGBUILD multilib/lib32-libxft/PKGBUILD multilib/lib32-libxinerama/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxmu/PKGBUILD multilib/lib32-libxrender/PKGBUILD multilib/lib32-libxss/PKGBUILD multilib/lib32-libxt/PKGBUILD multilib/lib32-libxtst/PKGBUILD multilib/lib32-libxv/PKGBUILD multilib/lib32-libxvmc/PKGBUILD multilib/lib32-libxxf86vm/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-openal/PKGBUILD multilib/lib32-speex/PKGBUILD testing/kdelibs3/PKGBUILD testing/kmod/PKGBUILD testing/php/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to '~mtjm/python-urlreader')
0 files changed, 0 insertions, 0 deletions