]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 50c2bb7)
Properly merge dive buddies and divemaster information
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 01:01:01 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 01:01:01 +0000 (18:01 -0700)
When we merge dives, we didn't merge these fields properly. Do it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

No differences found
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)