diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-24 11:27:18 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-24 11:27:18 -0300 |
commit | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (patch) | |
tree | e1302d14a6a73b6a674d2389d6427acb6b9ea870 /community/rtorrent/PKGBUILD | |
parent | 2792638784d70e22bfff1827f7e283c3158e58cf (diff) | |
parent | 9988621f899d7d4ae5fd0a4a32a4ba3abc5a527d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gtranslator/PKGBUILD
community-testing/gtranslator/gtranslator.changelog
extra/emelfm2/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/anjuta-extras/PKGBUILD
testing/anjuta/PKGBUILD
testing/gdl/PKGBUILD
testing/lv2/PKGBUILD
Diffstat (limited to 'community/rtorrent/PKGBUILD')
0 files changed, 0 insertions, 0 deletions