The two branches are only different in the use of wxDockit (HEAD uses it, VERSION_1_0 doesn't).
This difference makes our job a lot harder to keep them synchronized with the latest changes. I personally think we should merge these two branches. wxDockit has proved stable for the job and I see no other reason for having two different branches.
We will make a new branch when 1.0 is out.
So what do you, the other devs, think?
Yiannis.