[tuhopuu-devel] State of the merge
cwant at ualberta.ca
Mon May 23 02:08:11 CEST 2005
Fairly smooth merge. Here are the things that make poor
ol' Hos' hair turn grey:
* check render_panel_output(), went with tuhopuu code for conflict
as the stuff that was showing up from bf (backbuf, threads, etc)
seems to all be spread out in other places.
* check render_panels(), I mixed the two versions from tuho/bf
(e.g., bf had render_panel_anim() and render_panel_format() included
* flare panel may be shmushed.
* ramps/tramir panels may be shmushed
More information about the tuhopuu-devel