projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b8c1e81
547d451
)
Merge branch 'master' into 0.11
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:30:28 +0000
(19:30 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:30:28 +0000
(19:30 +0200)
1
2
gst/gstpad.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gst/gstpad.c
Simple merge