My Life as a Merge Monkey

[billroper]

Because it is so much fun, I am now merging my just a bit behind the times code line with my R&D code on top of the current code line that I merged the locking fixes to last month.

I am now staring at around 200 unresolved externals as I try to link up the DLL that handles the data and calculations.

I know these functions must be around here somewhere...

*sigh*