aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-10-26 17:06:35 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-10-26 17:06:35 +0100
commit274b12b5a8229242cd750fa95205ab63621c2c40 (patch)
tree2390cb92083cd2997a1c7d2f9e90e68224592880 /youtube_dl/extractor/__init__.py
parent23be51d8ce132dbb967f460e1225fdaaa43dff39 (diff)
parent1b10a011ec7544f49159ed60642128720333b8aa (diff)
downloadyoutube-dl-274b12b5a8229242cd750fa95205ab63621c2c40.tar.xz
Merge remote-tracking branch 'gabeos/crunchyroll-show-playlist'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 5ec9b4745..8e31de93d 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -62,7 +62,10 @@ from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
from .condenast import CondeNastIE
from .cracked import CrackedIE
from .criterion import CriterionIE
-from .crunchyroll import CrunchyrollIE
+from .crunchyroll import (
+ CrunchyrollIE,
+ CrunchyrollShowPlaylistIE
+)
from .cspan import CSpanIE
from .d8 import D8IE
from .dailymotion import (