summaryrefslogtreecommitdiff
path: root/extra/live-media
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-05 20:20:25 -0500
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-05 20:20:25 -0500
commit33c22f43a52aae722ce4d9cbe47f8d2fff31f395 (patch)
tree71f9661d9a843cca28225852f8784e48a2b96cb2 /extra/live-media
parentc87732e5659b56943ef4f120d7c71dcaabc3f849 (diff)
parent3695b5d62c2aef6e82abc95d775a2ebd89bce081 (diff)
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts: multilib-testing/lib32-mesa/PKGBUILD multilib/lib32-glew/PKGBUILD testing/iproute2/PKGBUILD
Diffstat (limited to 'extra/live-media')
0 files changed, 0 insertions, 0 deletions