summaryrefslogtreecommitdiff
path: root/staging/xine-lib/xine-lib-1.2.1-ffmpeg.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-05Tue Jun 5 00:01:46 UTC 2012root