From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Aug 2012 17:57:24 +0000 (-0700)
Subject: Merge branch 'misc-fixes' of git://github.com/DataBeaver/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d0e27c6c533005b5fd161286f68f1325bdabe8e3;hp=d0e27c6c533005b5fd161286f68f1325bdabe8e3;p=ext%2Fsubsurface.git

Merge branch 'misc-fixes' of git://github.com/DataBeaver/subsurface

Pull miscellaneous fixes, mostly UI stuff from Mikko Rasa.

Both this and the pull from Pierre-Yves Chibon created a "Save As" menu
entry and logic.  As a result, there were a fair number of conflicts,
but I tried to make the end result somewhat reasonable.  I might have
missed some semantic conflict, though.

Series-acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>

* 'misc-fixes' of git://github.com/DataBeaver/subsurface:
  Add a separate "Save as" entry to the menu
  Changes to menu icons
  Improved depth info for dives without samples
  Divide the panes evenly in view_three
---