projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e72742 d65490d)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:01 +0000 (11:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:01 +0000 (11:01 +0100)
Conflicts:
gst/rtp/gstrtpvrawdepay.c


Trivial merge
Domain: Multimedia / Media Common;