Silly button [was Re: latest Android apk]

[Dirk Hohndel]

On Mon, Jan 11, 2016 at 10:15:26AM +0000, Sebastian Kügler wrote:
> On Sunday, January 10, 2016 04:55:48 PM Dirk Hohndel wrote:
> > > On Jan 10, 2016, at 3:33 PM, Sebastian Kügler <sebas at kde.org> wrote:
> > >
> > >
> > > On Sunday, January 10, 2016 21:57:40 Henrik Brautaset Aronsen wrote:
> > >> 9. jan. 2016 21.55 skrev "Dirk Hohndel" <dirk at hohndel.org>:
> > >>
> > >>
> > >> The divelog list has overlapping text in the latest apk (.600)
> > >
> > >
> > >
> > > Seems there were some model changes. The (overlapping) text in the bottom
> > > right of the is now the location, and its duplicated while it was the dive
> > > number. Looks like a relatively simple mistake slipped in which caused
> > > this.>
> > >
> > >
> > > I'll fix that.
> >
> > It's already fixed in master and new APKs are up. It was a mistake that
> > Tomaz made that slipped in.
> 
> Ah wonderful. Thanks!
> 
> As to the branch-to-be-merged, I think it wasn't a good idea to let it hang
> over the weekend, I'm getting a few conflict now. (It's in my clone
> git at github.com:sebasje/subsurface.git [master].) I'll fix the conflicts
> tonight, and check if it can be merged.

Yes, I was quite busy this weekend. Had some free time and spent it on
addressing the issues on my punch list :-)

Let me know if you want help merging things.

/D