projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e45e7a3)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c


No differences found
Domain: Multimedia / Media Common;