projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6da5841 1aa5b76)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:27:43 +0000 (16:27 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:27:43 +0000 (16:27 +0200)
Conflicts:
libs/gst/base/gstbasetransform.c


Trivial merge
Domain: Multimedia / Media Common;