Merge branch 'atdotde'

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

Conflicts:
	qt-ui/diveplanner.cpp
	qt-ui/models.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/dive.h b/dive.h
index fe2b5c784..50bd2df39 100644
--- a/dive.h
+++ b/dive.h
@@ -91,6 +91,9 @@ static inline int get_he(const struct gasmix *mix)
 	return mix->he.permille;
 }
 
+extern void sanitize_gasmix(struct gasmix *mix);
+extern int gasmix_distance(const struct gasmix *a, const struct gasmix *b);
+
 static inline bool is_air(int o2, int he)
 {
 	return (he == 0) && (o2 == 0 || ((o2 >= O2_IN_AIR - 1) && (o2 <= O2_IN_AIR + 1)));