diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
commit | 3383a1fbd954b78716dd8ff9d9f2097e176d2279 (patch) | |
tree | 68aa3acbd50e6d0d7bdcfa2947d1772f7edb8a0d /extra/empathy/PKGBUILD | |
parent | 7f3d7e2203a9252280361a1d095528cb056d08dc (diff) | |
parent | 9e9ab642711f2424f828e21d14b98c45cdef2b29 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/liboglappth/PKGBUILD
community/texvc/PKGBUILD
extra/libvdpau/PKGBUILD
extra/minicom/PKGBUILD
extra/muparser/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/normalize/PKGBUILD
Diffstat (limited to 'extra/empathy/PKGBUILD')
0 files changed, 0 insertions, 0 deletions