Before I started working this

Before I started working this morning I did a ‘cvs update’, as I do every morning. Unfortunately, the changes the other programmer merged in from the PC version of the project totally screwed me up. I’m still trying to clean up the mess.