projects / platform / upstream / gst-plugins-good.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ac5eeb e780771)
Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:03:09 +0000 (15:03 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:03:09 +0000 (15:03 +0200)
Conflicts:
configure.ac

1  2 
ext/gdk_pixbuf/gstgdkpixbufoverlay.c patch | diff1 | diff2 | blob | history

diff --cc ext/gdk_pixbuf/gstgdkpixbufoverlay.c
Simple merge
Domain: Multimedia / Media Common;