projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4e0d3c 342a04c)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
Conflicts:
gst/colorspace/colorspace.c

1  2 
ext/schroedinger/gstschroenc.c patch | diff1 | diff2 | blob | history

diff --cc ext/schroedinger/gstschroenc.c
Simple merge
Domain: Multimedia / Media Common;