diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 19:24:41 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 19:24:41 +0200 |
| commit | 7f36e396768722319b4036b845cd9a105b60bd5b (patch) | |
| tree | cc91384b68fe52ce18a06dcc10331319f0b0de1a /youtube_dl/__init__.py | |
| parent | ebe3f89ea45dc74bbadab10acc27ebf91ddbb736 (diff) | |
| parent | 795cc5059a6f349f861e246269d6cced39b3a753 (diff) | |
Merge remote-tracking branch 'FiloSottille/supports'
Conflicts:
youtube-dl
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 0f9d73c46..5ed453bf7 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -351,6 +351,7 @@ def gen_extractors(): MixcloudIE(), StanfordOpenClassroomIE(), MTVIE(), + YoukuIE(), XNXXIE(), GenericIE() |