added branch merging comments
[platform/upstream/gstreamer.git] / components / bonobo-media /
drwxr-xr-x   ..
-rw-r--r-- 1129 Makefile.am
-rw-r--r-- 2075 bonobo-media-gstreamer-factory.c
-rw-r--r-- 6167 bonobo-media-gstreamer.gob
-rw-r--r-- 1387 bonobo-media-gstreamer.oafinfo
-rw-r--r-- 2455 bonobo-media-gstreamervideo.gob