Linus Torvalds 5ce5b05521 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@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-07-04 23:00:12 -07:00
..
2013-06-24 07:44:28 -07:00
2013-06-24 07:44:28 -07:00
2013-06-19 10:20:56 -07:00
2013-05-17 22:27:50 -07:00
2013-06-27 20:57:13 +08:00
2013-07-04 23:00:12 -07:00
2013-07-04 23:00:12 -07:00
2013-06-17 13:54:50 -03:00
2013-06-19 10:20:56 -07:00