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.h b/display.h
index b2187d224..fbffc8f95 100644
--- a/display.h
+++ b/display.h
@@ -19,6 +19,7 @@ struct plot_info {
 	int minpressure, maxpressure;
 	int mintemp, maxtemp;
 	double endtempcoord;
+	double maxpp;
 	gboolean has_ndl;
 	struct plot_data *entry;
 };