diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-16 05:14:00 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-16 05:14:00 +0100 |
| commit | e4a0489f6ebbbd26ca69caa42aa7ebdeb4fb3ce1 (patch) | |
| tree | 640e9d54de5d07de6e6b59a8bbcd12defafbbe0f /youtube_dl/extractor/__init__.py | |
| parent | b83be81d27e252eed4585fcce14205266b51b1d5 (diff) | |
| parent | 9b17ba0fa512a9882a22bb2407ec433038bc8327 (diff) | |
| download | youtube-dl-e4a0489f6ebbbd26ca69caa42aa7ebdeb4fb3ce1.tar.xz | |
Merge remote-tracking branch 'dstftw/channel9'
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 41b6289a5..f01fa2cde 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -21,6 +21,7 @@ from .c56 import C56IE from .canalplus import CanalplusIE from .canalc2 import Canalc2IE from .cbs import CBSIE +from .channel9 import Channel9IE from .cinemassacre import CinemassacreIE from .clipfish import ClipfishIE from .clipsyndicate import ClipsyndicateIE |