]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Merge branch 'ir90tv' of https://github.com/cyb3r/youtube-dl into cyb3r-ir90tv
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 25 Jul 2015 10:36:04 +0000 (18:36 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 25 Jul 2015 10:36:04 +0000 (18:36 +0800)
1  2 
youtube_dl/extractor/__init__.py

index 3cfa804ecf42db5603a30162310e681c38329aac,ee05a69583309105cc8f459e096590014057be39..ec4c017f31d0a2bad84a8d93430a97126865a022
@@@ -242,7 -229,7 +242,8 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
 +from .iqiyi import IqiyiIE
+ from .ir90tv import Ir90TvIE
  from .ivi import (
      IviIE,
      IviCompilationIE