projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f51563 c5ae6ee)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)
Conflicts:
plugins/elements/gstoutputselector.c

1  2 
gst/gststructure.c patch | diff1 | diff2 | blob | history
gst/gstvalue.c patch | diff1 | diff2 | blob | history

diff --cc gst/gststructure.c
Simple merge
diff --cc gst/gstvalue.c
Simple merge
Domain: Multimedia / Media Common;