summaryrefslogtreecommitdiffstats
path: root/core/divelist.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-12-09 13:04:03 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-12-14 00:25:07 +0800
commit10c20babaebbdd913368b1c521272a1d202f3e8a (patch)
treebf3248ea0febb139845e27671a0abc92bdecae8e /core/divelist.h
parenta597929c1023748d9e13a1603121a9851bd51b0d (diff)
downloadsubsurface-10c20babaebbdd913368b1c521272a1d202f3e8a.tar.gz
Cleanup: remove merge_two_dives() function
In 014c04f8bd30740e7711f3b3a01619fd27b5b613 merging dives was included in the undo-system. This made the merge_two_dives() function caller-less. Remove it. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.h')
-rw-r--r--core/divelist.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/divelist.h b/core/divelist.h
index a8478d8d5..ce4943660 100644
--- a/core/divelist.h
+++ b/core/divelist.h
@@ -36,7 +36,6 @@ extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive);
extern dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated);
extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated);
extern void autogroup_dives(void);
-extern struct dive *merge_two_dives(struct dive *a, struct dive *b);
extern bool consecutive_selected();
extern void select_dive(struct dive *dive);
extern void deselect_dive(struct dive *dive);