diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-11-27 19:39:10 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-11-28 23:58:35 +0100 |
| commit | a95cc2b1c5bb9bb4f2ad73f00f06a8d35af50e93 (patch) | |
| tree | 56fe700daeb274b1f68e0e35693f365164e86e10 /desktop-widgets | |
| parent | b7806d1b945851a6a1713e7d619e1b3f4ddee464 (diff) | |
| download | subsurface-a95cc2b1c5bb9bb4f2ad73f00f06a8d35af50e93.tar.gz | |
Merging dives: Improve merging of divemaster, buddy and notes
Change the merging behavior for the following information:
Divemaster, buddy, suit:
From "(a) or (b)" to "a, b"
Notes:
From "(a) or (b)" to "a\n--\nb"
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'desktop-widgets')
0 files changed, 0 insertions, 0 deletions