]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3a77eb8) | patch
Merge dive events correctly too
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 03:28:04 +0000 (20:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 03:28:04 +0000 (20:28 -0700)
commita6f6e8d6ff06d03fc01d8a6e7f50240e405b7ea6
tree431a89f9ae127cb2757ad78e1293cd7757991035tree | snapshot
parent3a77eb85101a5fb1dc186b88a3a02d2ae27690c7commit | diff
Merge dive events correctly too

It's very similar to the sample merging.

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)