Philipp Hagemeister 7853cc5ae1 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	youtube_dl/YoutubeDL.py

2013-10-22 22:30:06 +02:00

..

extractor

[arte.tv:creative] Update the title of the test

2013-10-22 21:06:06 +02:00

__init__.py

Add new option --abort-on-error

2013-10-18 23:09:32 +02:00

__main__.py

…

aes.py

Let aes_decrypt_text return bytes instead of unicode

2013-08-28 16:03:35 +02:00

FileDownloader.py

Make sure it only runs rtmpdump one time in test mode and return True if the download can be resumed

2013-10-11 12:42:15 +02:00

InfoExtractors.py

…

PostProcessor.py

Do not import *

2013-10-15 02:07:26 +02:00

update.py

[update] Prevent cmd window popup on Windows (Fixes #1478)

2013-09-29 14:37:06 +02:00

utils.py

Extend #980 with --max-quality support

2013-10-18 00:46:35 +02:00

version.py

release 2013.10.18.2

2013-10-18 23:22:54 +02:00

YoutubeDL.py

Merge remote-tracking branch 'origin/master'

2013-10-22 22:30:06 +02:00