diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-19 10:15:11 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-19 10:15:11 -0300 |
| commit | 4255b0aec5bcee0728d312531df99cc9a6e5ba08 (patch) | |
| tree | 9cc60e9b2dce5800b57651ea5b5989381530c9de /extra/kdemultimedia-kmix | |
| parent | 9e30cea6b8a2e90fd8958ca1f773e3a382179763 (diff) | |
| parent | 705d29694fd61c47a57ccec531e73d87a2960021 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxsession/PKGBUILD
community/uzbl/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnutls/PKGBUILD
extra/lapack/PKGBUILD
extra/libcap-ng/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/qt/PKGBUILD
extra/webkitgtk/PKGBUILD
Diffstat (limited to 'extra/kdemultimedia-kmix')
0 files changed, 0 insertions, 0 deletions