diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-01 18:21:36 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-01 18:21:36 +0200 |
| commit | 2db67bc0f40d8a2938145a6630901360834cf387 (patch) | |
| tree | 4d9301a3f01b2860a5cfd6494539bbe874665eae /youtube_dl/extractor/__init__.py | |
| parent | 7dba9cd0390f3cc89b1ff12ea1a4db6e8ddfd74b (diff) | |
| parent | 75dff0eef753f7bbef2947449441f4f6b2e13547 (diff) | |
| download | youtube-dl-2db67bc0f40d8a2938145a6630901360834cf387.tar.xz | |
Merge branch 'master' of github.com:rg3/youtube-dl
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 ba0e86713..ac2e5f0e7 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -67,7 +67,7 @@ from .yahoo import YahooIE, YahooSearchIE from .youjizz import YouJizzIE from .youku import YoukuIE from .youporn import YouPornIE -from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE +from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE, YoutubeShowIE from .zdf import ZDFIE |