schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse source 
Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-06-07 15:15:39 +02:00
commit ac1390eee8
4 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/extractor/__init__.py
View file

@ -267,6 +267,7 @@ from .swrmediathek import SWRMediathekIE
from .syfy import SyfyIE
from .sztvhu import SztvHuIE
from .tagesschau import TagesschauIE
from .teachingchannel import TeachingChannelIE
from .teamcoco import TeamcocoIE
from .techtalks import TechTalksIE
from .ted import TEDIE