diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-11 11:14:03 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-11 11:14:03 -0300 |
| commit | 828f6a7c0f0285abf2b1fb91895406dcb5d5b0e5 (patch) | |
| tree | fb283e1b49ba0e6a1fbb3748cc6600facf62fdc4 /community/mediatomb/PKGBUILD | |
| parent | 015d5bbcdc8bd4c24cd79582d13225844045d2ec (diff) | |
| parent | e81c6fe4fb38144709923b2da3ab68a01712a26b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/flac/PKGBUILD
extra/glib/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/qiv/PKGBUILD
extra/vamp-plugin-sdk/PKGBUILD
extra/vcdimager/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'community/mediatomb/PKGBUILD')
0 files changed, 0 insertions, 0 deletions