diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
| commit | 97a832ff546d30bb6eec34f23fd94aecab9ac738 (patch) | |
| tree | 90bbef126bf86efce995dfa00dadd9707baa8222 /extra/v4l-utils | |
| parent | 9879fa51372849ca7b637a1c22010584ca552274 (diff) | |
| parent | f935ebf41c626e4832f86c5f3f7ed1cc35128f6b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/egoboo/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdelibs/PKGBUILD
extra/maxima/PKGBUILD
extra/phonon/PKGBUILD
extra/rest/PKGBUILD
extra/ristretto/PKGBUILD
extra/samba/PKGBUILD
extra/sbcl/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/v4l-utils')
0 files changed, 0 insertions, 0 deletions