removing conflict traces
[platform/upstream/gstreamer.git] / examples / manual /
drwxr-xr-x   ..
-rw-r--r-- 209 .gitignore
-rw-r--r-- 983 Makefile.am
-rwxr-xr-x 1019 extract.pl