From: Linus Torvalds Date: Thu, 24 Nov 2011 18:42:37 +0000 (-0800) Subject: Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=290ce56d0181c0c7e7d6e1af3eb27d3015cffca7;p=ext%2Fsubsurface.git Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface * 'mac-fixes' of git://git.hohndel.org/subsurface: Split reading/writing preferences into OS specific files --- 290ce56d0181c0c7e7d6e1af3eb27d3015cffca7