From: Linus Torvalds Date: Thu, 15 Dec 2011 02:19:48 +0000 (-0800) Subject: Merge branch 'forlinus' of git://git.hohndel.org/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=b0759feef87fcf820682cb36d65f2252c2cc12ae;p=ext%2Fsubsurface.git Merge branch 'forlinus' of git://git.hohndel.org/subsurface * 'forlinus' of git://git.hohndel.org/subsurface: Improve Makefile for MacOS Add reasonable default device names for divecomputer import More intuitive label for "not saving" when exiting --- b0759feef87fcf820682cb36d65f2252c2cc12ae