On Sat, Feb 01, 2014 at 02:07:46PM +0000, Steve Fryatt wrote:
> On 31 Jan, Vincent Sanders wrote in message
> <20140131184930.GE31163@kyllikki.org>:
>
> > On Thu, Jan 30, 2014 at 11:51:34PM +0000, Steve Fryatt wrote:
> > > On 30 Jan, Daniel Silverstone wrote in message
> > > <20140130120127.GK26047@somnambulist.local>:
> > >
> > > > On Sun, Jan 26, 2014 at 15:44:17 +0000, Steve Fryatt wrote:
> > > >
> > > > > PS: Should I be deleting my branches once they're merged? If so,
> > > > > what's the preferred way to do it?
> > > >
> > > > Yes, [...]
> > >
> > > Thanks -- I've tidied up after myself now.
> >
> > I merged your menus branch again, so assuming the merge was correct you
> > can remove that too.
>
> I was intending to still work on it a bit more: carefully reading the code
> to understand what was going on with the gui_poll() issue turned up a few
> things that look completely wrong (in the "probably don't even work" sense),
> so I'd intended to fix those in the branch (or document why they were
> correct all along) and make sure that I was happy with everything before
> merging it all back in.
oops, premature merge...
>
> I don't think there should be issues with the second set of changes you've
> merged, though -- and if there are, I'm sure someone will let me know fairly
> soon. :-)
yeah, thanks to the wonders of git you can just keep on going then,
let me know if you need me to merge, though of course you should be ok
to do that yourself for anything riscos ish.
--
Regards Vincent
http://www.kyllikki.org/
No comments:
Post a Comment