Update of /cvsroot/avida/avida/current/source/main In directory sc8-pr-cvs1:/tmp/cvs-serv31376/source/main Modified Files: Tag: kaben config.cc config.hh Log Message: okay, _maybe_ I've figured out how to merge w/o conflicts. let us hope.