]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7bbe44f dc2a0c1)
Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 17:46:42 +0000 (10:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 17:46:42 +0000 (10:46 -0700)
commit2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6
tree7927f2494f5ac0018e7feca7c6fa4fe739c67345tree | snapshot
parent7bbe44f46a96a405b3a67b452f18a95044b9b25dcommit | diff
parentdc2a0c1909727a1557b8f03e6b6ac3e427ebe4b7commit | diff
Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface

* 'otu-tracking-v2' of git://github.com/dirkhh/subsurface:
  Make OTU column invisible by default
  Add OTU to divelist
  Calculate OTUs for every dive

Fix up trivial conflicts in dive.h (due to dive event handling also
adding a field to the dive structure)
dive.h diff1 | diff2 | blob | history
parse-xml.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)