I 've merged VERSION_1_0 and HEAD branches to HEAD.
VERSION_1_0 is stlll there, but don't use it anymore. I will only merge updates to it when they 're considered stable and tested in HEAD.
That's the way it should 've been since when we branched in the first place...
Update your local sources to work on HEAD.If any of you has commited anything on VERSION_1_0 in the last 2-3 hours, please check that it made it to HEAD (else contact me).
Although most things should be working, some Makefiles might be out of sync. We 'll fix them, don't panic
Notice that I 'm still working on the merge, at a logic level. For example, when auto-hide is enabled for the messages, it might crash. I 'm working on it and it will be fixed soon.
On a final note,
I haven't merged the help_plugin and wxSmith because I 'm not really sure on which branch their active development takes place. So I ask their devs to contact me and resolve this.
Yiannis.