Hi guys, I've just merged trunk into bs2 branch and of course got a conflict on the Changelog file. What was the decision on what to do with branch changelogs, I can't remember? Cheers Lex -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.geany.org/pipermail/devel/attachments/20100302/d0282a9f/attachment.html>