projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 504c668 62d68c4)
Merge remote-tracking branch 'rzhxeo/youtube'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Dec 2013 03:37:40 +0000 (04:37 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 23 Dec 2013 03:37:40 +0000 (04:37 +0100)
1  2 
youtube_dl/YoutubeDL.py patch | diff1 | diff2 | blob | history
youtube_dl/extractor/youtube.py patch | diff1 | diff2 | blob | history

diff --cc youtube_dl/YoutubeDL.py
Simple merge
diff --cc youtube_dl/extractor/youtube.py
Simple merge
Totally unverified clone of youtube-dl