diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 16:03:10 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 16:03:10 +0200 |
| commit | a0fded5c375344b8a1e1d445aa24c5f9607a2cd8 (patch) | |
| tree | 79ce75158bb1834a43a3996fe5b27b770e679c92 | |
| parent | d33909302e04463e30d0bbe398678bf001e28339 (diff) | |
| parent | d0e95889c0601942ce03c605f37d9fce48b1ed84 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst/gstpad.h
gst/gstplugin.h
0 files changed, 0 insertions, 0 deletions