From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Aug 2012 17:28:10 +0000 (-0700)
Subject: Merge branch 'suit' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=91e7dcc555ada4fe43198327383e895e528c4cc7

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

91e7dcc555ada4fe43198327383e895e528c4cc7
diff --cc divelist.c
index e994b32,8cf0793..36c5883
--- a/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,