Argh! <br><br>It seems that I once again have heaps of weird conflicts again (probably as a result of having some commits occurring in 2.5 before my previous merge was completed). Anyways, I'm currently unable to continue merging as TortoiseSVN bails out on rna_object_force.c with complaints of "inconsistent line endings". <br>
<br>Help on this would be great. <br>My last merge commit was <a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074</a><br>
<br>Cheers,<br>Joshua<br>