pull request

[Dirk Hohndel]

Linus,

here is an updated pull request with three more trip related commits.
This adds two more features that were requested and fixes a rather
interesting little issue when adding a dive to an existing collection
that already has trips established.

/D

The following changes since commit 4679f4fbbc1f303b963b4eabebbbc9c684299619:

  Avoid duplicate dive_trip entries (2012-09-05 13:54:22 -0700)

are available in the git repository at:

  git://git.hohndel.org/subsurface.git trip3

for you to fetch changes up to 42bff28e47b549ebb1002152182879fd5af823a0:

  Make "create trip above" also add on selected dives (2012-09-07 10:58:36 -0700)

----------------------------------------------------------------
Dirk Hohndel (3):
      Merge one or more dives with the trip above
      Handle new dives correctly if trips exist
      Make "create trip above" also add on selected dives

 dive.h     |   1 +
 divelist.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 154 insertions(+), 11 deletions(-)