projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f88f6c1)
Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:02 +0000 (23:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:02 +0000 (23:20 +0000)
Conflicts:
ext/rtmp/gstrtmpsink.c


No differences found
Domain: Multimedia / Media Common;