[tuhopuu-devel] State of the merge

[Jonathan Merritt]

Hi Chris,

You do a thoroughly amazing job with this!! :-)  Having now had to merge 
code a few times myself, I can only boggle at the fact that you do this 
on a regular basis.

Thanks on my behalf, and I'm sure from everyone else! :-)  I'm just 
checking things now...

> I did the monthly merge this evening, mostly went smoothly.
> There are some areas that I was unsure about that folks
> might want to check. I tagged CVS with PREMERGE_2004_07_03
> if you need to get the old files back for comparison.
> I apologize if I've clobbered your work.


-- 
Jonathan Merritt.
PhD Student - Equine Biomechanics.
Equine Centre, The University of Melbourne,
Werribee, Victoria, Australia.