projects / youtube-dl / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88f9d87 97fcf1b)
Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube...
authorSergey M․ <dstftw@gmail.com>
Thu, 14 May 2015 09:18:58 +0000 (15:18 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 14 May 2015 09:18:58 +0000 (15:18 +0600)
commit98b8ec8616611194dee77dc6ad88303bae72ce6d
treecf48e43095537498b263ab76c3ab61f9429c3ff7tree | snapshot
parent88f9d8748c19d1ee6a06e95eb5ed4dc31052e9adcommit | diff
parent97fcf1bbd07ae0c5b6e530dcf2623d199452a76ccommit | diff
Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv

Conflicts:
youtube_dl/YoutubeDL.py
youtube_dl/YoutubeDL.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.