Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:06:30 +0000 (17:06 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:06:30 +0000 (17:06 +0000)
1  2 
gst/gstcaps.c
gst/gstpadtemplate.c
tests/check/Makefile.am

diff --cc gst/gstcaps.c
Simple merge
Simple merge
Simple merge