projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c649050 6800d0c)
Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
Conflicts:
gst/mpegtsdemux/tsdemux.c


Trivial merge
Domain: Multimedia / Media Common;