Merge branch 'boyle-ready' of https://github.com/Slagvi/subsurface

Fixed merge conflicts in
	deco.c
	dive.h
	planner.c

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

1 files changed, 3 insertions, 1 deletions

diff --git a/dive.h b/dive.h
index d0ef47ded..d5681f163 100644
--- a/dive.h
+++ b/dive.h
@@ -800,7 +800,9 @@ extern void cache_deco_state(double, char **datap);
 extern double restore_deco_state(char *data);
 extern void nuclear_regeneration(double time);
 extern void vpmb_start_gradient();
-extern void vpmb_next_gradient(double deco_time);
+extern void vpmb_next_gradient(double deco_time, double surface_pressure);
+extern bool is_vpmb_ok(double pressure);
+extern void boyles_law(double first_stop_pressure, double next_stop_pressure);
 
 /* this should be converted to use our types */
 struct divedatapoint {