Make planner work again for CCR dives

[Dirk Hohndel]

On Thu, Oct 16, 2014 at 05:28:42PM +0200, Robert Helling wrote:
> Hi,
> 
> the latest CCR patches had rendered the planner not usable for CCR
> dives. This patch corrects this (and reenables the CCR set point column
> for segments). The problem was that a new member setpoint of struct
> divepoint had been introduced, but there was already po2 which had the
> same meaning. This patch merges the two and renames them setpoint to
> prevent future confusion.

I'm a bit nervous that it doesn't apply to latest master.
Do you have other code in your tree that isn't upstream?

/D