projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32ea413 696a9a6)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:48:44 +0000 (09:48 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:48:44 +0000 (09:48 +0200)
Conflicts:
gst/gstpad.h

1  2 
gst/gstclock.h patch | diff1 | diff2 | blob | history

diff --cc gst/gstclock.h
Simple merge
Domain: Multimedia / Media Common;