projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3267a38 2c4bc61)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
1  2 
tests/examples/camerabin/gst-camera.c patch | diff1 | diff2 | blob | history

diff --cc tests/examples/camerabin/gst-camera.c
Simple merge
Domain: Multimedia / Media Common;