simon 0590c5e568 the conflict is gone. remove the markers and bump ...

ok kevlo@, "go ahead" robert@

2007-06-11 11:01:27 +00:00

..

pkg

the conflict is gone. remove the markers and bump

2007-06-11 11:01:27 +00:00

distinfo

update to version 1.6.0

2007-05-31 05:21:25 +00:00

Makefile

the conflict is gone. remove the markers and bump

2007-06-11 11:01:27 +00:00