From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Oct 2011 05:03:22 +0000 (+0200)
Subject: Merge branch 'ui' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=a72408400c67a142b9abaec89df954df7dac7a71;hp=--cc;p=ext%2Fsubsurface.git

Merge branch 'ui' of git://github.com/dirkhh/subsurface

* 'ui' of git://github.com/dirkhh/subsurface:
  Disable sorting by dive number
  Fix oversight in preference implementation
  Make columns for temperature, cylinder, and nitrox optional
  Show dive number in dive list
  Improve time marker handling and add printing of some time labels
---

a72408400c67a142b9abaec89df954df7dac7a71