diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-16 10:55:58 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2012-12-16 15:46:54 -1000 |
commit | 73defa9a52e9c22fa6c87b6c2ff779da213efd1a (patch) | |
tree | e0b0cef64e7fed5a0e7a0ffd5b2c51901f39743e /libdivecomputer.c | |
parent | 92c15238b6043c927a1f8bc8fd541086e1d5f306 (diff) | |
download | subsurface-73defa9a52e9c22fa6c87b6c2ff779da213efd1a.tar.gz |
Use dive computer model/ID when trying to merge dives
If we havd divecomputer model and dive ID information available, use
that to match existing dives when trying to merge them.
Otherwise fall back to the fuzzy time-based merging logic.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'libdivecomputer.c')
0 files changed, 0 insertions, 0 deletions