diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-20 12:30:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-20 12:30:58 -0700 |
| commit | e8578ad9c9709778ec368a604bc7a53bf8757308 (patch) | |
| tree | 3f375f924841f30d4ea9f12e9b05ce300ef6acf5 /subsurface.desktop | |
| parent | 574d4d4facb83ee5505a988f5dc5830602fc8048 (diff) | |
| parent | a8e2fd10c7845496e42e6f5b2f4d133d3cf5640b (diff) | |
| download | subsurface-e8578ad9c9709778ec368a604bc7a53bf8757308.tar.gz | |
Merge branch 'divetrip-rewrite' of git://github.com/torvalds/subsurface
Merge the dive trip rewrite by Dirk Hohndel.
This just merges the dive trip changes with the timestamp handling
changes. There were multiple small data conflicts, along with some
newly added 'time_t' cases in the dive trip handling that needed to be
converted to 'timestamp_t' along the way.
* 'divetrip-rewrite' of git://github.com/torvalds/subsurface:
Convert FIND_TRIP into function
Partial rewrite of the dive trip code
Check if trip is NULL before calling DIVE_TRIP
Diffstat (limited to 'subsurface.desktop')
0 files changed, 0 insertions, 0 deletions