[...]
the mentioned branch should be just fine (maybe Jens can do another merge before)
[...]
I will see what I can do.
Merging is not as easy as it would like it to be (too many other merges [debugger-branch and trunk]).
Merging the branches was imposiible, nuch too much merge conflicts.
I created a new (local) branch and recreated the console-branch which is now (at the moment) a real child of trunk (might break again if xml-branch is merged).
I will try to do the merges more often, so it will not divert as much as it was.
@MortenMacFly and other devs:
should I create a complete new branch on the server (e.g. cb_headless) or should I delete the old one and recreate it (with the same name) from my new local branch ?