projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
bd3749e
7862ad8
)
Merge branch 'puls4' of https://github.com/HanYOLO/youtube-dl into HanYOLO-puls4
author
Sergey M․
<dstftw@gmail.com>
Fri, 27 Feb 2015 18:22:48 +0000
(
00:22
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 27 Feb 2015 18:22:48 +0000
(
00:22
+0600)
1
2
youtube_dl/extractor/__init__.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
youtube_dl/extractor/__init__.py
index aecb67bf4390c8f9c9ee604157fac7f2556f778e,d137e11049642e02dc7d9893f0d7061d43f840c1..ffcc7d9ab3c8fa44b99e5660ab179b84ace94429
---
1
/
youtube_dl/extractor/__init__.py
---
2
/
youtube_dl/extractor/__init__.py
+++ b/
youtube_dl/extractor/__init__.py
@@@
-346,7
-346,6
+346,7
@@@
from .ntvde import NTVDeI
from .ntvru import NTVRuIE
from .nytimes import NYTimesIE
from .nuvid import NuvidIE
+from .odnoklassniki import OdnoklassnikiIE
from .oktoberfesttv import OktoberfestTVIE
from .ooyala import OoyalaIE
from .openfilm import OpenFilmIE
@@@
-374,6
-373,7
+374,7
@@@
from .pornotube import PornotubeI
from .pornoxo import PornoXOIE
from .promptfile import PromptFileIE
from .prosiebensat1 import ProSiebenSat1IE
+ from .puls4 import Puls4IE
from .pyvideo import PyvideoIE
from .quickvid import QuickVidIE
from .r7 import R7IE