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)

diff --cc dive.h
index b121892e9296de5e8e2844124123fa0d728db9ea,5cb32412308ee2219efa8f1c2e5faabeadfc5ab1..42d91d630a0776f63b8605d61e6e5f1c429578a0
--- 1/dive.h
--- 2/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[];
  };

diff --cc parse-xml.c
Simple merge