projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae84f87 0a43ddf)
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
1  2 
youtube_dl/FileDownloader.py patch | diff1 | diff2 | blob | history
youtube_dl/extractor/cinemassacre.py patch | diff1 | diff2 | blob | history

diff --cc youtube_dl/FileDownloader.py
Simple merge
diff --cc youtube_dl/extractor/cinemassacre.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.