From: Sergey M․ Date: Fri, 5 Sep 2014 12:01:11 +0000 (+0700) Subject: Merge branch 'dbtv' of https://github.com/mrkolby/youtube-dl into mrkolby-dbtv X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=1c1cff6a525bc8fc506cf2c6eb8963abc3b1fcee;p=youtube-dl Merge branch 'dbtv' of https://github.com/mrkolby/youtube-dl into mrkolby-dbtv Conflicts: youtube_dl/extractor/__init__.py --- 1c1cff6a525bc8fc506cf2c6eb8963abc3b1fcee diff --cc youtube_dl/extractor/__init__.py index d54ad8057,c43dfd7ea..7adca7df9 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -67,12 -62,10 +67,13 @@@ from .dailymotion import DailymotionUserIE, ) from .daum import DaumIE + from .dbtv import DBTVIE +from .dfb import DFBIE from .dotsub import DotsubIE from .dreisat import DreiSatIE +from .drtuber import DrTuberIE from .drtv import DRTVIE +from .dump import DumpIE from .defense import DefenseGouvFrIE from .discovery import DiscoveryIE from .divxstage import DivxStageIE