summaryrefslogtreecommitdiff
path: root/extra/pavucontrol/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-04 10:03:29 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-04 10:03:29 +0100
commit188c20297098b706ee2687fe404b0c63eb2600d9 (patch)
tree069c4fab3fe7423afdcc360ffeba09900c66a00c /extra/pavucontrol/PKGBUILD
parentf104a5865e580d1a5c50f83b6bfac2885f065c92 (diff)
parent2030e810a5cfd4d3ff6e0f8930560c96f2990eb2 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/ccrypt/PKGBUILD community/mathomatic/PKGBUILD community/tuxpaint/PKGBUILD extra/aisleriot/PKGBUILD extra/dhcp/PKGBUILD extra/gnome-applets/PKGBUILD extra/gnome-shell/PKGBUILD extra/xdg-user-dirs-gtk/PKGBUILD
Diffstat (limited to 'extra/pavucontrol/PKGBUILD')
0 files changed, 0 insertions, 0 deletions