projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23be51d 1b10a01)
Merge remote-tracking branch 'gabeos/crunchyroll-show-playlist'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 26 Oct 2014 16:06:35 +0000 (17:06 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 26 Oct 2014 16:06:35 +0000 (17:06 +0100)
1  2 
youtube_dl/extractor/__init__.py patch | diff1 | diff2 | blob | history
youtube_dl/extractor/crunchyroll.py patch | diff1 | diff2 | blob | history

diff --cc youtube_dl/extractor/__init__.py
Simple merge
diff --cc youtube_dl/extractor/crunchyroll.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.