Skip to content
Snippets Groups Projects
Commit ed4b967d authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

Conflicts:
	ext/mad/gstmad.c
parents 7de44ab6 2e35999f
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment