projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 309b5fa ca417fd)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:29:05 +0000 (16:29 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:29:05 +0000 (16:29 +0100)
1  2 
gst/isomp4/atomsrecovery.c patch | diff1 | diff2 | blob | history

diff --cc gst/isomp4/atomsrecovery.c
Simple merge
Domain: Multimedia / Media Common;