diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-27 15:36:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-27 15:36:27 -0700 |
| commit | c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7 (patch) | |
| tree | 643795a8127b7fea2813f999148c1467cc5b4537 /print.c | |
| parent | a44d0049f6370d022067b8aee5e847f9fe550cf1 (diff) | |
| parent | 9cf961249e197d6d8a3656968ce15dfd19e3ef3b (diff) | |
| download | subsurface-c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7.tar.gz | |
Merge branch 'trips' of git://git.hohndel.org/subsurface
Merge the initial 'track trips explicitly' code from Dirk Hohndel.
Fix up trivial conflicts in save-xml.c due to the new 'is_attribute'
flag.
* 'trips' of git://git.hohndel.org/subsurface:
Fix an issue with trips that have dives from multiple input files
Some simple test dives for the trips code
First cut of explicit trip tracking
Diffstat (limited to 'print.c')
0 files changed, 0 insertions, 0 deletions