[tuhopuu-devel] State of the merge

[Chris Want]

Here's this week's damage:

Syntax highlighting: went with bf version for all conflicts.

buttons_scene.c: render buttons had some conflicts due to
Ton's new way of handling events... should be checked.

buttons_script.c: this file was one big messy conflict, due
to added render scriptlink type in bf-blender. I mostly went
with the tuhopuu way of doing things. Matt: you might want to
discuss with IanWill whether your way of displaying this
information is a good way to go in bf too.

Event handling: went with bf-version (i.e., the version that
didn't have a variable named 'eventhack'). please check timeline
stuff.

Chris