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, 1 insertions, 0 deletions

diff --git a/display-gtk.h b/display-gtk.h
index b48c87eed..b2903d7e9 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -19,6 +19,7 @@ typedef struct {
 	gboolean nitrox;
 	gboolean sac;
 	gboolean otu;
+	gboolean maxcns;
 } visible_cols_t;
 
 typedef struct {