From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Sep 2011 17:46:42 +0000 (-0700)
Subject: Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6

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)
---

2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6
diff --cc dive.h
index b121892,5cb3241..42d91d6
--- a/dive.h
+++ b/dive.h
@@@ -171,7 -161,7 +176,8 @@@ struct dive 
  	depth_t visibility;
  	temperature_t airtemp, watertemp;
  	cylinder_t cylinder[MAX_CYLINDERS];
+ 	int otu;
 +	struct event *events;
  	int samples, alloc_samples;
  	struct sample sample[];
  };