]> git.tdb.fi Git - ext/subsurface.git/commit
Merge branch 'forlinus' of git://git.hohndel.org/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 02:19:48 +0000 (18:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 02:19:48 +0000 (18:19 -0800)
commitb0759feef87fcf820682cb36d65f2252c2cc12ae
tree4767b4ac0f5222c1500cb1f0826b94e87fd4b6b0
parentdf12fcf310d97ba7244755c687c6119da17928e2
parent6245b700a4a98cc2dba8c5b8c3f4958491605755
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