Hi guys,<br><br>I&#39;ve just merged trunk into bs2 branch and of course got a conflict on the Changelog file.<br><br>What was the decision on what to do with branch changelogs, I can&#39;t remember?<br><br>Cheers<br>Lex<br>