projects
/
platform
/
upstream
/
gst-plugins-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d33a3f
)
Merge branch 'master' into 0.11
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000
(09:36 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000
(09:36 +0200)
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
No differences found