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

This commit is contained in:
Sergey M․ 2015-03-19 21:27:38 +06:00
commit 2ed849eccf
2 changed files with 5 additions and 1 deletions

View File

@ -112,6 +112,7 @@
- **Discovery** - **Discovery**
- **divxstage**: DivxStage - **divxstage**: DivxStage
- **Dotsub** - **Dotsub**
- **DouyuTV**
- **DRBonanza** - **DRBonanza**
- **Dropbox** - **Dropbox**
- **DrTuber** - **DrTuber**
@ -342,6 +343,7 @@
- **PornHubPlaylist** - **PornHubPlaylist**
- **Pornotube** - **Pornotube**
- **PornoXO** - **PornoXO**
- **PrimeShareTV**
- **PromptFile** - **PromptFile**
- **prosiebensat1**: ProSiebenSat.1 Digital - **prosiebensat1**: ProSiebenSat.1 Digital
- **Puls4** - **Puls4**
@ -367,6 +369,7 @@
- **RTP** - **RTP**
- **RTS**: RTS.ch - **RTS**: RTS.ch
- **rtve.es:alacarta**: RTVE a la carta - **rtve.es:alacarta**: RTVE a la carta
- **rtve.es:infantil**: RTVE infantil
- **rtve.es:live**: RTVE.es live streams - **rtve.es:live**: RTVE.es live streams
- **RUHD** - **RUHD**
- **rutube**: Rutube videos - **rutube**: Rutube videos
@ -487,6 +490,7 @@
- **Ubu** - **Ubu**
- **udemy** - **udemy**
- **udemy:course** - **udemy:course**
- **Ultimedia**
- **Unistra** - **Unistra**
- **Urort**: NRK P3 Urørt - **Urort**: NRK P3 Urørt
- **ustream** - **ustream**

View File

@ -1,3 +1,3 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '2015.03.15' __version__ = '2015.03.18'