projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05c3928 a701e85)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 11:58:42 +0000 (12:58 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 11:58:42 +0000 (12:58 +0100)
1  2 
gst/rtsp-server/rtsp-media.c patch | diff1 | diff2 | blob | history

diff --cc gst/rtsp-server/rtsp-media.c
Simple merge
Domain: Multimedia / Media Common;