diff options
| author | Christian Schaller <uraeus@gnome.org> | 2004-03-07 11:26:27 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2004-03-07 11:26:27 +0000 |
| commit | 87d5670f80f7d371c098710d5798ba4736ed9604 (patch) | |
| tree | 30f4ec1832738268cd33a2b2bff73983f6938e8a /gst/qtdemux/qtdemux.c | |
| parent | c0a0422f35f26f863616b9704793cd3af605af1c (diff) | |
remove conflict indicators
Original commit message from CVS:
remove conflict indicators
Diffstat (limited to 'gst/qtdemux/qtdemux.c')
0 files changed, 0 insertions, 0 deletions