mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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
This commit is contained in:
commit
91577f11b5
12 changed files with 188 additions and 315 deletions
|
@ -19,6 +19,7 @@ struct plot_info {
|
|||
int minpressure, maxpressure;
|
||||
int mintemp, maxtemp;
|
||||
double endtempcoord;
|
||||
double maxpp;
|
||||
gboolean has_ndl;
|
||||
struct plot_data *entry;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue