diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-07 15:38:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-07 15:38:32 -0700 |
| commit | f51066fe40cb8d0bf9b6130adc1c85af3934ffe7 (patch) | |
| tree | d10c4e0f3baa27399ba4692c98cda1f6b0d9fdb2 /file.h | |
| parent | b6812946319080699f6071656f09d402d23d3e46 (diff) | |
| parent | d0867a79d48d6fcb894ac7385fdfb2b7e599021f (diff) | |
| download | subsurface-f51066fe40cb8d0bf9b6130adc1c85af3934ffe7.tar.gz | |
Merge branch 'trip3' of git://git.hohndel.org/subsurface
Pull more trip handling fixes from Dirk Hohndel.
And the "delete dive" functionality too.
* 'trip3' of git://git.hohndel.org/subsurface:
Implement delete dive option
Make "create trip above" also add on selected dives
Handle new dives correctly if trips exist
Merge one or more dives with the trip above
Diffstat (limited to 'file.h')
0 files changed, 0 insertions, 0 deletions