summaryrefslogtreecommitdiff
path: root/community/echat
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
commit251b132bc8d5157b996afff54617d2483637aa4b (patch)
tree7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /community/echat
parent3ed19e74567434fe0bc82d835513b5b62f151838 (diff)
parent07455ea1de16867b168628e8a9f7f5bffc169a5f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/r8168-lts/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/r8168-lts/PKGBUILD community-testing/sage-mathematics/PKGBUILD community/ruby-gtk2/PKGBUILD core/dhcpcd/PKGBUILD core/glibc/PKGBUILD core/net-tools/PKGBUILD cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD extra/cups/PKGBUILD extra/maxima/PKGBUILD extra/scim-hangul/PKGBUILD extra/speech-dispatcher/PKGBUILD extra/subversion/PKGBUILD extra/telepathy-idle/PKGBUILD extra/x11vnc/PKGBUILD multilib-testing/binutils-multilib/PKGBUILD multilib-testing/gcc-multilib/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-krb5/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxrandr/PKGBUILD multilib/lib32-p11-kit/PKGBUILD testing/binutils/PKGBUILD testing/calligra/PKGBUILD testing/dhcp/PKGBUILD testing/gcc/PKGBUILD testing/glibc/PKGBUILD testing/inkscape/PKGBUILD testing/iproute2/PKGBUILD testing/libreoffice/PKGBUILD testing/libreoffice/PKGBUILD.36 testing/poppler/PKGBUILD
Diffstat (limited to 'community/echat')
0 files changed, 0 insertions, 0 deletions