FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove conflict indicator

Browse Source 
Original commit message from CVS:
remove conflict indicator
This commit is contained in:
Christian Schaller 2006-02-28 10:40:01 +00:00
parent 08f49d1eba
commit aa8a5cb824
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -68,7 +68,6 @@
* ext/annodex/gstskeltag.h: * ext/annodex/gstskeltag.h:
Deleted; these files aren't used any more either. Deleted; these files aren't used any more either.
>>>>>>> 1.2189
2006-02-25 Julien MOUTTE <julien@moutte.net> 2006-02-25 Julien MOUTTE <julien@moutte.net>
* ext/Makefile.am: Fix dist-check. * ext/Makefile.am: Fix dist-check.