diff options
Diffstat (limited to 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/divelist.h b/core/divelist.h index 11fa75f50..0f8a6138c 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -44,8 +44,7 @@ extern void deselect_dive(struct dive *dive); extern void select_dives_in_trip(struct dive_trip *trip); extern void deselect_dives_in_trip(struct dive_trip *trip); extern void filter_dive(struct dive *d, bool shown); -extern void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b); -extern dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b); +extern dive_trip_t *combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b); extern struct dive *first_selected_dive(); extern struct dive *last_selected_dive(); extern bool is_trip_before_after(const struct dive *dive, bool before); |