removing conflict traces
[platform/upstream/gstreamer.git] / examples / pingpong /
drwxr-xr-x   ..
-rw-r--r-- 57 .gitignore
-rw-r--r-- 90 Makefile.am
-rw-r--r-- 2739 pingpong.c