]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 26 Nov 2012 22:25:04 +0000 (23:25 +0100)
1  2 
Makefile
README.md
youtube-dl.1

diff --cc Makefile
Simple merge
diff --cc README.md
Simple merge
diff --cc youtube-dl.1
Simple merge