projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d6192a 76b1bd6)
Merge remote-tracking branch 'origin/prefer-ffmpeg'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 17:32:06 +0000 (18:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 17:32:06 +0000 (18:32 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.