diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
| commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
| tree | a472ad2701076586f54fbd0859fe2e5c8311184b /extra/libktorrent/PKGBUILD | |
| parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
| parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'extra/libktorrent/PKGBUILD')
0 files changed, 0 insertions, 0 deletions