projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca00695 b4dea3a)
Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 07:40:38 +0000 (09:40 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 07:43:21 +0000 (09:43 +0200)
Conflicts:
win32/common/libgstreamer.def

1  2 
docs/gst/gstreamer-sections.txt patch | diff1 | diff2 | blob | history
gst/gstcaps.c patch | diff1 | diff2 | blob | history
gst/gststructure.c patch | diff1 | diff2 | blob | history
gst/gststructure.h patch | diff1 | diff2 | blob | history
win32/common/libgstreamer.def patch | diff1 | diff2 | blob | history

diff --cc docs/gst/gstreamer-sections.txt
Simple merge
diff --cc gst/gstcaps.c
Simple merge
diff --cc gst/gststructure.c
Simple merge
diff --cc gst/gststructure.h
Simple merge
diff --cc win32/common/libgstreamer.def
Simple merge
Domain: Multimedia / Media Common;