-
David Schleef authored
Original commit message from CVS: ChangeLog: remove conflict markers
f6e42cd3
To find the state of this project's repository at the time of any of these versions, check out the tags.
Original commit message from CVS: ChangeLog: remove conflict markers