summaryrefslogtreecommitdiff
path: root/community/bsd-games/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-01 10:50:46 -0300
commit3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch)
tree05623159a5ae88f6eed2414db216bc9a0d2d71c5 /community/bsd-games/PKGBUILD
parentd4157e6db6dd7e03802aa9c361a1902e81c2545a (diff)
parent9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/geany/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/cpupower.conf community/linux-tools/cpupower.rc community/stk/PKGBUILD core/patch/PKGBUILD core/systemd/PKGBUILD extra/lftp/PKGBUILD extra/lftp/lftp-4.3.8-gets.patch extra/mysql/PKGBUILD extra/qt/PKGBUILD extra/transmission/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/glibmm/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/libgdata/PKGBUILD gnome-unstable/libgnome-keyring/PKGBUILD gnome-unstable/pango/PKGBUILD gnome-unstable/polkit/PKGBUILD gnome-unstable/telepathy-glib/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/wine/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/systemd/PKGBUILD testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/bsd-games/PKGBUILD')
0 files changed, 0 insertions, 0 deletions