I’m still working from home on on this mega merge I have to do.
It got really hard yesterday trying to get the stuff to compile. As an indication of the size of the task, I pulled some stats out of CVS:
Since the two code streams were one some time in May (?), on the first branch there have been more than 10,000 lines of changes in 286 files, and on the other branch there have been more than 42,000 lines of changes in 1209 files.
And I’m trying to bring the two together!