projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adee562 3daf1ec)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 16:24:41 +0000 (18:24 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 16:24:41 +0000 (18:24 +0200)
Conflicts:
configure.ac
docs/plugins/inspect/plugin-esdsink.xml
docs/plugins/inspect/plugin-gconfelements.xml

1  2 
gst/rtpmanager/rtpsession.c patch | diff1 | diff2 | blob | history

diff --cc gst/rtpmanager/rtpsession.c
Simple merge
Domain: Multimedia / Media Common;