daniel/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'sehrgut/Grooveshark'

Browse Source 
Conflicts:
	youtube_dl/__init__.py
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister
2014-08-23 16:41:14 +02:00
parent 49f3c16543 ee1a7032d5
commit 00558d9414
3 changed files with 207 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/extractor/__init__.py
View File

@@ -126,6 +126,7 @@ from .googleplus import GooglePlusIE
from .googlesearch import GoogleSearchIE
from .gorillavid import GorillaVidIE
from .goshgay import GoshgayIE
from .grooveshark import GroovesharkIE
from .hark import HarkIE
from .helsinki import HelsinkiIE
from .hentaistigma import HentaiStigmaIE