Merge branch 'cns' into cns-merge

I foolishly changed visible_columns in both the (ill-named) cns branch and
master...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	divelist.c
	gtk-gui.c
	profile.c

1 files changed, 3 insertions, 1 deletions

diff --git a/dive.h b/dive.h
index 487bc0d0e..7927512b7 100644
--- a/dive.h
+++ b/dive.h
@@ -230,6 +230,8 @@ struct sample {
 	duration_t ndl;
 	duration_t stoptime;
 	depth_t stopdepth;
+	int cns;
+	int po2;
 };
 
 /*
@@ -314,7 +316,7 @@ struct dive {
 	cylinder_t cylinder[MAX_CYLINDERS];
 	weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS];
 	char *suit;
-	int sac, otu;
+	int sac, otu, cns, maxcns;
 
 	/* Eventually we'll do multiple dive computers */
 	struct divecomputer dc;