Merge branch 'gh-pages' of /home/phihag/projects/youtube-dl/. into gh-pages

Browse Source

Conflicts:
	download.html
	update/LATEST_VERSION
	update/versions.json

...

This commit is contained in:

Philipp Hagemeister

2013-01-12 18:20:20 +01:00

parent efad35fb70 7aa6cb5973

commit 680adff87b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available