projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc12ade de30ca6)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Apr 2011 17:07:13 +0000 (19:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Apr 2011 17:07:13 +0000 (19:07 +0200)
Conflicts:
common
configure.ac

1  2 
configure.ac patch | diff1 | diff2 | blob | history
gst/rtsp-server/rtsp-media.c patch | diff1 | diff2 | blob | history

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