Hi Paul, Could you resolve the conflicts and then resubmit ?
I will accept the merge as soon as it is fixed and as soon as I've the agreement of people who currently have a branch. Please sync with trunk ASAP so you can sync again with the trunk after the merge. Lionel On Thu, 10 Jun 2010 00:11:25 -0400, Paul Natsuo Kishimoto <[email protected]> wrote: > Hallo, > > In case you'd missed the automated Launchpad mail, the first part of > the code reorganization (putting UI things in a new GTG/gtk directory) > is ready to merge. Is anyone in the mood to look it over at > https://code.launchpad.net/~gtg-contributors/gtg/code-layout/+merge/26624 > ? I'd be very grateful! _______________________________________________ Mailing list: https://launchpad.net/~gtg-contributors Post to : [email protected] Unsubscribe : https://launchpad.net/~gtg-contributors More help : https://help.launchpad.net/ListHelp

