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 'atdotde'

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

Conflicts:
	qt-ui/diveplanner.cpp
	qt-ui/models.cpp
This commit is contained in:
Dirk Hohndel 2014-05-26 08:23:22 -07:00
commit cfe865dd0c
4 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

@ -520,7 +520,7 @@ static int same_rounded_pressure(pressure_t a, pressure_t b)
return abs(a.mbar - b.mbar) <= 500;
}
static void sanitize_gasmix(struct gasmix *mix)
void sanitize_gasmix(struct gasmix *mix)
{
unsigned int o2, he;
@ -1253,7 +1253,7 @@ static void merge_weightsystem_info(weightsystem_t *res, weightsystem_t *a, weig
*res = *a;
}
static int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
{
int a_o2 = get_o2(a), b_o2 = get_o2(b);
int a_he = get_he(a), b_he = get_he(b);