From: Philipp Hagemeister Date: Sat, 23 Aug 2014 14:41:14 +0000 (+0200) Subject: Merge remote-tracking branch 'sehrgut/Grooveshark' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=00558d94145f97c644e66ec086fa9b9d8c58280f;p=youtube-dl Merge remote-tracking branch 'sehrgut/Grooveshark' Conflicts: youtube_dl/__init__.py youtube_dl/extractor/__init__.py --- 00558d94145f97c644e66ec086fa9b9d8c58280f diff --cc youtube_dl/__init__.py index f156ba3a0,cd4e9b484..613ce3576 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@@ -56,21 -56,7 +56,22 @@@ __authors__ = 'Nicolas Évrard', 'Jason Normore', 'Hoje Lee', - 'Keith Beckman' + 'Adam Thalhammer', + 'Georg Jähnig', + 'Ralf Haring', + 'Koki Takahashi', + 'Ariset Llerena', + 'Adam Malcontenti-Wilson', + 'Tobias Bell', + 'Naglis Jonaitis', + 'Charles Chen', + 'Hassaan Ali', + 'Dobrosław Żybort', + 'David Fabijan', + 'Sebastian Haas', + 'Alexander Kirk', + 'Erik Johnson', ++ 'Keith Beckman', ) __license__ = 'Public Domain' diff --cc youtube_dl/extractor/__init__.py index ddcf2e414,3f6c67fa5..0d7824023 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -121,11 -107,9 +121,12 @@@ from .gamestar import GameStarI from .gametrailers import GametrailersIE from .gdcvault import GDCVaultIE from .generic import GenericIE +from .godtube import GodTubeIE 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