projects / platform / upstream / gst-editing-services.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fe25be 737acd8)
Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 16:24:37 +0000 (17:24 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 16:24:37 +0000 (17:24 +0100)
Conflicts:
bindings/python/Makefile.am
bindings/python/ges.override
bindings/python/gesmodule.c
configure.ac

1  2 
ges/ges-timeline-pipeline.c patch | diff1 | diff2 | blob | history
ges/ges-timeline-pipeline.h patch | diff1 | diff2 | blob | history

diff --cc ges/ges-timeline-pipeline.c
Simple merge
diff --cc ges/ges-timeline-pipeline.h
Simple merge
Domain: Multimedia / Media Editing;