projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e769320 9c5a12c)
Merge branch 'master' into 0.11-fdo
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Mar 2011 18:50:59 +0000 (20:50 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Mar 2011 18:50:59 +0000 (20:50 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
gst/rtsp/gstrtspsrc.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc gst/rtsp/gstrtspsrc.c
Simple merge
Domain: Multimedia / Media Common;