diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-27 20:23:53 -0300 |
| commit | 3a3f329b736af639fdd3c9621816bad627b96903 (patch) | |
| tree | a0935f38e21136a3b7eeb93d0ec5c449c12de5b0 /extra/telepathy-kde-presence-applet | |
| parent | 4d788e769855cbef2539d7cf7049dc2b4d9ac2e0 (diff) | |
| parent | 2c30604c9ff749660a4b8507eec99e679cf19508 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kdenlive/PKGBUILD
community-staging/openscenegraph/PKGBUILD
community-staging/schroot/PKGBUILD
community-staging/wt/PKGBUILD
community-testing/cdfs/PKGBUILD
community-testing/pingus/PKGBUILD
community-testing/tagpy/PKGBUILD
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
community/surf/PKGBUILD
community/unpaper/PKGBUILD
core/flex/PKGBUILD
core/gcc/PKGBUILD
extra/boost/PKGBUILD
extra/cups/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtk2/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/qt/PKGBUILD
kde-unstable/akonadi/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
libre/virtualbox-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/bind/PKGBUILD
testing/dnsutils/PKGBUILD
testing/iptables/PKGBUILD
testing/nouveau-dri/PKGBUILD
Diffstat (limited to 'extra/telepathy-kde-presence-applet')
0 files changed, 0 insertions, 0 deletions