projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5df82c8 01d8725)
Merge remote-tracking branch 'origin/master' into symbol-exports
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 18:54:06 +0000 (19:54 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 18:54:06 +0000 (19:54 +0100)
1  2 
gst/parse/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc gst/parse/Makefile.am
Simple merge
Domain: Multimedia / Media Common;