diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /extra/libsamplerate/PKGBUILD | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/libsamplerate/PKGBUILD')
0 files changed, 0 insertions, 0 deletions