mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cns' into cns-merge

Browse source 
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
This commit is contained in:
Dirk Hohndel 2012-12-11 13:09:48 -08:00
commit 91577f11b5
12 changed files with 188 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dive.h
View file

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