diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-22 00:21:27 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-22 00:21:27 +0100 |
| commit | 6562df768d6af708a5aab6ed4964b250925e42b4 (patch) | |
| tree | e09935cd995654cb3864e819747f33ab0f518243 /youtube_dl/extractor/__init__.py | |
| parent | 06769acd717191ed61ce639314975816a8f7969c (diff) | |
| parent | 47917f24c499f7949b04a23c35459ca69adae62d (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
Conflicts:
youtube_dl/extractor/mtv.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 7b374f7b9..4d6aeabdf 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -119,7 +119,10 @@ from .mit import TechTVMITIE, MITIE from .mixcloud import MixcloudIE from .mpora import MporaIE from .mofosex import MofosexIE -from .mtv import MTVIE +from .mtv import ( + MTVIE, + MTVIggyIE, +) from .muzu import MuzuTVIE from .myspace import MySpaceIE from .myspass import MySpassIE @@ -171,6 +174,7 @@ from .southparkstudios import ( from .space import SpaceIE from .spankwire import SpankwireIE from .spiegel import SpiegelIE +from .spike import SpikeIE from .stanfordoc import StanfordOpenClassroomIE from .statigram import StatigramIE from .steam import SteamIE |