projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2101830 d494389)
Merge remote-tracking branch 'jaimeMF/load-info'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:55:02 +0000 (04:55 +0100)
1  2 
youtube_dl/YoutubeDL.py patch | diff1 | diff2 | blob | history
youtube_dl/__init__.py patch | diff1 | diff2 | blob | history

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