[tuhopuu-devel] State of the merge

[Kester Maddock]

On Sunday 07 March 2004 06:13, Chris Want wrote:
> * Just about every Sconscript had conflicts.
> I don't have time to debug Scons (I don't understand
> it) so I have just copied the conflicting sconscripts
> from bf-blender to tuhopuu (the support in bf-blender
> seems to be better developed).
I've started using scons for gameengine.  I'll work that out.
>
> * A lot of files in extern/solid had a lot of weird
> little conflicts. Rather than scrutinize the problems,
> I opted to just keep the extern/solid files from tuhopuu2
> (I think they were updated more recently than the bf-blender
> files)
There was a post about Unix/Win32 line endings on blender.org - I think Michel 
just dos2unix'd the lot.

Kester