Re: [MiNT] New branches !

[Alan Hourihane <alanh@fairlite.co.uk>]

On Tue, 2010-01-05 at 00:13 +0100, Helmut Karlowski wrote:
> Am 04.01.2010, 23:39 Uhr, schrieb Alan Hourihane <alanh@fairlite.co.uk>:
> 
> > Secondly, I've created a branch "helmut-enhancements" with Helmut's own
> > XAAES changes too.
> 
> Could you please chose another name for this? Maybe xaaes-alt or  
> xaaes-exp, if possible?

Probably, but what's in a name :-) It's harder now the branch is created
and changes made though.

> > Hopefully we'll be able to reconcile all these recent changes into the
> > mainline code along with my own "freemint-enhancements" branch as a
> > pre-cursor to a new release.
> 
> I think this is going to work. I would have suggested to save Odds changes  
> and have a closer look during the next time, but maybe it's better this  
> way.

Odd's work is saved on a new branch called "ozk-enhancements", so I
haven't removed anything, just reset the mainline branch to before Odd's
work.

So please look at that branch too to see what Odd has done and maybe
start merging his work into yours.

Alan.