aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-08 18:32:06 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-08 18:32:06 +0100
commit35aa7098cd22249e3ab446925a27c57572ff49d9 (patch)
tree961af62fc0af980d803a8b2ab4eb9af02f36ac2e /README.md
parent9d6192a5b8d81b2997fa7dc7bb1b2a3db0183a91 (diff)
parent76b1bd672d56d4776f377a586a9b64145e089345 (diff)
Merge remote-tracking branch 'origin/prefer-ffmpeg'
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions