removing conflict traces
[platform/upstream/gstreamer.git] / examples / appreader /
drwxr-xr-x   ..
-rw-r--r-- 10 .gitignore
-rw-r--r-- 93 Makefile.am
-rw-r--r-- 2224 appreader.c