projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be3156d cc7aeb3)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:26:38 +0000 (15:26 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:26:38 +0000 (15:26 +0200)
Conflicts:
gst/rtp/gstrtpvrawdepay.c


Trivial merge
Domain: Multimedia / Media Common;