I’ve spent all day merging code streams together today. It’s been quite painful because I’ve not been able to use CVS‘s automatic merging, and had to do it all by hand. Basically, half the stuff on one branch has already been merged, and now they want the other half, except for one change. But I think I’ve got it all done now. I just need to test it thoroughly.