removing conflict traces
[platform/upstream/gstreamer.git] / examples / xml /
drwxr-xr-x   ..
-rw-r--r-- 29 .gitignore
-rw-r--r-- 157 Makefile.am
-rw-r--r-- 2702 createxml.c
-rw-r--r-- 1317 runxml.c