vcs.fsf.org Git - mediagoblin.git/commit - mediagoblin/media_types/video/__init_

author	Joar Wandborg <git@wandborg.com>
	Tue, 27 Mar 2012 10:05:09 +0000 (12:05 +0200)
committer	Joar Wandborg <git@wandborg.com>
	Tue, 27 Mar 2012 10:05:09 +0000 (12:05 +0200)
commit	deea3f6661df68a62d56317915ca1e71240061d4
tree	6b7708610db3500f07f494519d57eec7a0799eee	tree \| snapshot (zip tar.gz)
parent	d0cb752992ce6cea2b8581dead5481591ddbb82b	commit \| diff
parent	c56d4b55a169d67a3e5e5aba4271a67f0cb79c6f	commit \| diff

Merge remote-tracking branch 'joar/audio+sniffing'

Conflicts:
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/video/__init__.py
mediagoblin/media_types/video/processing.py
mediagoblin/tests/test_submission.py

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

mediagoblin/config_spec.ini	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/ascii/processing.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/image/processing.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/video/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/video/processing.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/processing/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/static/js/audio.js	\|	diff2 \|	blob \| history
mediagoblin/static/js/geolocation-map.js	diff1 \|	diff2 \|	blob \| history
mediagoblin/submit/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_submission.py	diff1 \|	diff2 \|	blob \| history