summaryrefslogtreecommitdiff
path: root/extra/live-media
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-28 16:08:39 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-28 16:08:39 -0300
commitcd972a1ebaf9446976ea495f013947a8937c15b0 (patch)
tree92b30b6f040bcb928f9a9139ade24be6d2a03410 /extra/live-media
parent272c3b872f166f5e86dcf51bb510e93246170d26 (diff)
parent5c5e1e3a998a54db424b8261fac042ab41745d99 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/apr-util/PKGBUILD extra/udisks/PKGBUILD
Diffstat (limited to 'extra/live-media')
0 files changed, 0 insertions, 0 deletions