From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Aug 2012 22:36:27 +0000 (-0700)
Subject: Merge branch 'trips' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7;hp=c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7;p=ext%2Fsubsurface.git

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
---