Merge branch 'suit' of git://git.hohndel.org/subsurface

Pull exposure suit tracking from Dirk Hohndel.

* 'suit' of git://git.hohndel.org/subsurface:
  Add exposure protection tracking

diff --cc divelist.c
index e994b32527d1dd2289259b5f489052fd8303971e,8cf079391bba04710be801558e137e6d1dd4e0b4..36c5883b1e0e15784fa2a34741fb26372c87bc6c
--- 1/divelist.c
--- 2/divelist.c
+++ b/divelist.c
@@@ -555,10 -562,11 +562,12 @@@ static void fill_one_dive(struct dive *
                DIVE_SAC, dive->sac,
                DIVE_OTU, dive->otu,
                DIVE_TOTALWEIGHT, total_weight(dive),
+               DIVE_SUIT, suit,
                -1);
  
 -      /* this will create a merge conflict with the memory leak patches */
 +      free(location);
 +      free(cylinder);
+       free(suit);
  }
  
  static gboolean set_one_dive(GtkTreeModel *model,

diff --cc info.c
Simple merge