]> git.bitcoin.ninja Git - youtube-dl/commitdiff
projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3a8613 b0dcc3c)
Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Jun 2013 22:06:01 +0000 (00:06 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Jun 2013 22:09:11 +0000 (00:09 +0200)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
Totally unverified clone of youtube-dl