I just wanted to do Abdel a favour and merged my latest changes to his branch. I discovered that it already included Peters latest changes, but e.g. not the latest scons work by Bo. That makes working with branches more difficult than it should be, so please follow this simple rule:
If you merge something to a branch that is intended to follow the trunk, merge everything up to the desired revision, and not only parts of it. If you don't know how to do that: One possible way is explained at http://wiki.lyx.org/devel/pmwiki.php/DevelTips/Branches I believe that Abdels branch is now in sync with revision 14109 of trunk, but am not sure. Georg
