diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 09:16:32 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 09:16:32 +0100 |
| commit | ed4b967d162ce2aef6afd6d03c71ca23cba172d1 (patch) | |
| tree | 6127fd20aff2a982294d0ebc22c768024de47e95 /docs | |
| parent | 7de44ab61be209b2a9d537ac34967db224766344 (diff) | |
| parent | 2e35999f68c530f3c1076ba6d4753c13bc72fff4 (diff) | |
| download | gstreamer-plugins-ugly-ed4b967d162ce2aef6afd6d03c71ca23cba172d1.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/mad/gstmad.c
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions