diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-01 15:19:45 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-01 15:19:45 +0200 |
| commit | 53936f3d571cc5ef36742f468666d04fc995056a (patch) | |
| tree | 206b10a312cd8a0c4310d476b4e46b4f80edf52c /youtube_dl/extractor/__init__.py | |
| parent | 0beb3add18f8da0e558369074100e9105da82b8e (diff) | |
| parent | 887a227953cfc8acda774064bbe2c22755c5a81d (diff) | |
| download | youtube-dl-53936f3d571cc5ef36742f468666d04fc995056a.tar.xz | |
Merge remote-tracking branch 'yasoob/master'
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 98733e394..ba0e86713 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -48,6 +48,7 @@ from .steam import SteamIE from .teamcoco import TeamcocoIE from .ted import TEDIE from .tf1 import TF1IE +from .traileraddict import TrailerAddictIE from .tudou import TudouIE from .tumblr import TumblrIE from .tutv import TutvIE |