removing conflict traces
[platform/upstream/gstreamer.git] / examples / cutter /
drwxr-xr-x   ..
-rw-r--r-- 7 .gitignore
-rw-r--r-- 109 Makefile.am
-rw-r--r-- 5532 cutter.c
-rw-r--r-- 202 cutter.h