[PATCH] Qt: Implement trip merging logic

[Linus Torvalds]

Ping?

This one, and the patch to fix the Uemis download, seem to still be missing..

                 Linus

On Wed, Jun 26, 2013 at 10:22 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
>
> From: Linus Torvalds <torvalds at linux-foundation.org>
> Date: Wed, 26 Jun 2013 19:16:40 -1000
> Subject: [PATCH] Qt: Implement trip merging logic
>
> So during my Maui trip, I had a short hiatus in diving, causing
> subsurface to start a new trip for the last day of diving.  I could have
> just started the old gtk branch to fix it up, but decided that I might
> as well try to implement the "merge trip" logic in the Qt branch instead.
>
> This is the end result of that.
>
> Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>