diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-28 14:26:26 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-06-29 10:44:01 -0700 |
| commit | 628c7c8f13d662583a1e6aac2af4b0cff7ebb8c5 (patch) | |
| tree | adcc618dbdb5024b2bb29cf1d3f3ab267d49d13d /CHANGELOG.md | |
| parent | ac533a64334e6cfbc9008ac2f678b0cf88d60a2c (diff) | |
| download | subsurface-628c7c8f13d662583a1e6aac2af4b0cff7ebb8c5.tar.gz | |
Fix dive merging with multiple cylinders
We did something really horribly wrong when merging cylinders. It's
been broken since commit 7c9f46a ("Core: remove MAX_CYLINDERS
restriction"), and used some really strange logic.
This rewrites the logic to be (I think) a bit more easy to understand.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f1879cad5..924f99933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +desktop: fix broken merging of dives with multiple cylinders mobile: add information about the cloud sync state to the Subsurface plate in the menu --- |