[tuhopuu-devel] State of the Merge

[Chris Want]

A real half-assed effort for a merge (it's
hard to be motivated when retirement is
so close ...). I doubt things compile, but
I'll work at it a bit in the next few days,
and so should you.

Things to note:

* If the conflict was due to unicode support
I went with the bf version.

* If the conflict was due to painting I went
with bf version.

* 50/50 chance of going either way for other
conflicts.

Chris