]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master
authorSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 15:58:12 +0000 (21:58 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 15:58:12 +0000 (21:58 +0600)
1  2 
README.md
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/options.py
youtube_dl/postprocessor/ffmpeg.py

diff --cc README.md
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge