projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69f8921 48275dc)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
1  2 
ext/assrender/gstassrender.c patch | diff1 | diff2 | blob | history

diff --cc ext/assrender/gstassrender.c
Simple merge
Domain: Multimedia / Media Common;