don't forget to remove conflict marker...
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 25 Oct 2001 13:24:16 +0000 (13:24 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 25 Oct 2001 13:24:16 +0000 (13:24 +0000)
commitb14f8a35d38c8757edc3972103f3e16145c71d85
tree6ba6bb03c32caadf67df668a8adea70516efa68f
parent1c59cd9ed7efdc0ae8f2e683338f56154570b275
don't forget to remove conflict marker...
ChangeLog.claws