trunk or charon-merge?

[jondecker76]

At what point do we start using trunck as apposed to the charon-merge branch?

[tschak909]

when daniel finishes the merge and says GO.

-Thom

[danielk]

Jon, I've been held back a little from completing the merge due to autobuild problems. But I've set up a new builder at which I'm taking through the paces right now. Then I'll point it at the charonmerge branch and fix up any autobuild problems before completing the merge. ETA for merge 2-3 weeks.

[jondecker76]

yes, I saw the new autobuild which is why I asked.. Thanks for the update!