projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: deda8ac 7e660ac)
Merge remote-tracking branch 'liudongmiao/patch-subtitle'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 00:45:21 +0000 (02:45 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 22 Aug 2014 00:45:21 +0000 (02:45 +0200)
1  2 
youtube_dl/extractor/youtube.py patch | diff1 | diff2 | blob | history

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