projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e286db3 debe9ca)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 9 Dec 2011 12:08:37 +0000 (12:08 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 9 Dec 2011 12:08:37 +0000 (12:08 +0000)
1  2 
gst/typefind/gsttypefindfunctions.c patch | diff1 | diff2 | blob | history

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