diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-11 17:11:25 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-11 17:11:25 +0100 |
| commit | 69f491f14e132a54e8ca7de291183dced64d461d (patch) | |
| tree | f2261c36f461ee6b3c0917eb3ac7fd88f9a34122 /youtube_dl/extractor/__init__.py | |
| parent | cb007f47c1685e1d17a8fc7be7920293610290a6 (diff) | |
| parent | ce36339575da408c5d795f691d07d2e310292b28 (diff) | |
Merge remote-tracking branch 'fstirlitz/master'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 027fb06f9..6b7660ab1 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -51,7 +51,6 @@ from .cbsnews import CBSNewsIE from .ceskatelevize import CeskaTelevizeIE from .channel9 import Channel9IE from .chilloutzone import ChilloutzoneIE -from .cinemassacre import CinemassacreIE from .clipfish import ClipfishIE from .cliphunter import CliphunterIE from .clipsyndicate import ClipsyndicateIE @@ -336,6 +335,7 @@ from .savefrom import SaveFromIE from .sbs import SBSIE from .scivee import SciVeeIE from .screencast import ScreencastIE +from .screenwavemedia import ScreenwaveMediaIE from .servingsys import ServingSysIE from .sexu import SexuIE from .sexykarma import SexyKarmaIE |