projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67cd7fd aa2bfc9)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 10:07:45 +0000 (12:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 May 2011 10:07:45 +0000 (12:07 +0200)
Conflicts:
docs/plugins/gstreamer-plugins.hierarchy

1  2 
docs/plugins/gstreamer-plugins.args patch | diff1 | diff2 | blob | history
gst/gstpreset.c patch | diff1 | diff2 | blob | history

diff --cc docs/plugins/gstreamer-plugins.args
Simple merge
diff --cc gst/gstpreset.c
Simple merge
Domain: Multimedia / Media Common;