projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b39f4a8 d4105d4)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:24 +0000 (10:31 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:24 +0000 (10:31 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
gst/fieldanalysis/gstfieldanalysis.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc gst/fieldanalysis/gstfieldanalysis.c
Simple merge
Domain: Multimedia / Media Common;