From: Philipp Hagemeister Date: Wed, 28 Aug 2013 11:10:59 +0000 (+0200) Subject: Merge remote-tracking branch 'Huarong/master' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=f8b362739e4f469b501aa804beb95cf1cfb1c916;p=youtube-dl Merge remote-tracking branch 'Huarong/master' --- f8b362739e4f469b501aa804beb95cf1cfb1c916 diff --cc youtube_dl/extractor/__init__.py index 21e9e5d37,3a08d676f..6b5037c8c --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -65,11 -53,9 +65,12 @@@ from .pornotube import PornotubeI from .rbmaradio import RBMARadioIE from .redtube import RedTubeIE from .ringtv import RingTVIE +from .ro220 import Ro220IE from .roxwel import RoxwelIE +from .rtlnow import RTLnowIE from .sina import SinaIE +from .slashdot import SlashdotIE + from .sohu import SohuIE from .soundcloud import SoundcloudIE, SoundcloudSetIE from .spiegel import SpiegelIE from .stanfordoc import StanfordOpenClassroomIE