Philipp Hagemeister 5f0d813d93 Merge remote-tracking branch 'rupertbaxter2/master' ... Conflicts: youtube_dl/__init__.py youtube_dl/downloader/common.py		2015-01-23 12:05:01 +01:00
..
downloader	Merge remote-tracking branch 'rupertbaxter2/master'	2015-01-23 12:05:01 +01:00
extractor	[generic] Add support for Cinerama player (Fixes #4752)	2015-01-23 12:00:25 +01:00
postprocessor	Embed description and URL as MP4 tags	2015-01-18 15:01:05 -08:00
__init__.py	Merge remote-tracking branch 'rupertbaxter2/master'	2015-01-23 12:05:01 +01:00
__main__.py
aes.py
cache.py
compat.py
jsinterp.py
options.py	Merge remote-tracking branch 'rupertbaxter2/master'	2015-01-23 12:05:01 +01:00
swfinterp.py
update.py
utils.py	[utils] Simplify HTTPS socket creation	2015-01-23 11:15:18 +01:00
version.py	release 2015.01.23.2	2015-01-23 11:20:24 +01:00
YoutubeDL.py	Merge remote-tracking branch 'rupertbaxter2/master'	2015-01-23 12:05:01 +01:00