summaryrefslogtreecommitdiff
path: root/staging/amule
AgeCommit message (Collapse)Author
2012-01-25Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/libvisual-projectm/PKGBUILD community/python-memcached/PKGBUILD community/python-mpi4py/PKGBUILD core/sqlite3/PKGBUILD core/udev/PKGBUILD extra/kdeplasma-applets-networkmanagement/PKGBUILD extra/pixman/PKGBUILD extra/sg3_utils/PKGBUILD libre/kdeutils-libre/PKGBUILD libre/linux-libre/PKGBUILD libre/linux-libre/linux-libre.install multilib/lib32-libxcb/PKGBUILD multilib/lib32-openssl/PKGBUILD multilib/lib32-sdl_image/PKGBUILD multilib/lib32-sqlite3/PKGBUILD multilib/lib32-udev/PKGBUILD
2012-01-20Fri Jan 20 23:14:48 UTC 2012root