summaryrefslogtreecommitdiff
path: root/staging/kdemultimedia/ffmpeg0.11.patch
AgeCommit message (Collapse)Author
2012-06-07Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/nbd/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD kde-unstable/libkcompactdisc/PKGBUILD
2012-06-06Wed Jun 6 00:01:34 UTC 2012root