summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst/media-info/media-info.h
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2004-03-07 11:26:27 +0000
committerChristian Schaller <uraeus@gnome.org>2004-03-07 11:26:27 +0000
commit5aa8875165a582f5aa48c2137744609794040980 (patch)
treeaab15876b3c8f597c003ee193f05a0c9b677bc0a /gst-libs/gst/media-info/media-info.h
parentc2bd172e390be9f72bd2442a19dd2cd7c7705013 (diff)
downloadgst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.tar.gz
gst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.tar.bz2
gst-plugins-bad-5aa8875165a582f5aa48c2137744609794040980.zip
remove conflict indicators
Original commit message from CVS: remove conflict indicators
Diffstat (limited to 'gst-libs/gst/media-info/media-info.h')
0 files changed, 0 insertions, 0 deletions