]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d344d15) | patch
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)
commit50c2bb7c71b279237f05c1c0a530d494bad534c8
tree99fc2d146a2c0fb36ea365501f04eb788a41dc0dtree | snapshot
parentd344d15a905576ca25a0585e6beb554388628bc6commit | diff
Properly merge dive buddies and divemaster information

When we merge dives, we didn't merge these fields properly. Do it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
dive.c diff | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)