summaryrefslogtreecommitdiff
path: root/extra/avidemux
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-13 11:55:35 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-12-13 11:55:35 -0300
commit69fbf2ca624da30dfaefb4c4150715df81d8cf00 (patch)
tree43a6191492a1d6a8b2dbf3a5fc30e04418407eff /extra/avidemux
parent20325742c50f83cc58e49aa3b8347fde1399d734 (diff)
parentcb9c375209c236c16557878a1b864f91de27b88d (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/ctpl/PKGBUILD extra/ffmpeg/PKGBUILD extra/subversion/PKGBUILD multilib/lib32-libtiff/PKGBUILD
Diffstat (limited to 'extra/avidemux')
0 files changed, 0 insertions, 0 deletions