summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-27 10:46:42 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-27 10:46:42 -0700
commit2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6 (patch)
tree7927f2494f5ac0018e7feca7c6fa4fe739c67345 /Makefile
parent7bbe44f46a96a405b3a67b452f18a95044b9b25d (diff)
parentdc2a0c1909727a1557b8f03e6b6ac3e427ebe4b7 (diff)
downloadsubsurface-2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6.tar.gz
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)
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions