summaryrefslogtreecommitdiff
path: root/extra/alsa-lib/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-02-01 10:33:01 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-02-01 10:33:01 +0100
commit59b32159d6180c35a742ced756dc139659dc1dd5 (patch)
tree4f03740ae853d27d51d69666d511ffb527d27a9e /extra/alsa-lib/PKGBUILD
parent5330206481631dda2c1e585b758c58f90ab807ee (diff)
parentc34f78dd37c2a2015d43de5d89748a2f8147ba1b (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/openscenegraph/PKGBUILD community-testing/speed-dreams/PKGBUILD community-testing/speed-dreams/speed-dreams.desktop community-testing/xemacs/PKGBUILD community/ibus/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/virtuoso/PKGBUILD multilib-testing/lib32-gdk-pixbuf2/PKGBUILD multilib-testing/lib32-pango/PKGBUILD multilib-testing/wine/PKGBUILD multilib/lib32-e2fsprogs/PKGBUILD multilib/lib32-gmp/PKGBUILD multilib/lib32-libidn/PKGBUILD multilib/lib32-pixman/PKGBUILD testing/fontforge/PKGBUILD testing/java7-openjdk/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdegraphics-okular/PKGBUILD testing/kdegraphics-strigi-analyzer/PKGBUILD testing/libreoffice/PKGBUILD testing/libreoffice/PKGBUILD.next_stable testing/opencv/PKGBUILD testing/php/PKGBUILD testing/php/php-fpm.conf.in.patch testing/php/php.ini.patch testing/xine-ui/PKGBUILD
Diffstat (limited to 'extra/alsa-lib/PKGBUILD')
0 files changed, 0 insertions, 0 deletions