projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ac7184 1f7f434)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 10:14:20 +0000 (10:14 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 10:14:20 +0000 (10:14 +0000)
Conflicts:
tests/examples/cairo/Makefile.am

1  2 
sys/v4l2/gstv4l2object.c patch | diff1 | diff2 | blob | history

diff --cc sys/v4l2/gstv4l2object.c
Simple merge
Domain: Multimedia / Media Common;