summaryrefslogtreecommitdiffstats
path: root/examples/gob
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-03-02 13:33:39 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-03-02 13:33:39 +0000
commit5e1e68c06852a560f7b5c4cef88e9b758bd81871 (patch)
tree470deed3fe41863e0a7de85ed02aff65db3f382b /examples/gob
parent6ffee3230a7bde00c690fa7467e1b1442c89cba3 (diff)
downloadgst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.tar.gz
gst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.tar.bz2
gst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.zip
Remove spurious conflict marker
Original commit message from CVS: Remove spurious conflict marker
Diffstat (limited to 'examples/gob')
0 files changed, 0 insertions, 0 deletions