projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81ebc0a a9a85bb)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 17:26:33 +0000 (19:26 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 17:26:33 +0000 (19:26 +0200)
1  2 
gst/typefind/gsttypefindfunctions.c patch | diff1 | diff2 | blob | history

diff --cc gst/typefind/gsttypefindfunctions.c
Simple merge
Domain: Multimedia / Media Common;