]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 23:57:08 +0000 (15:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Nov 2011 23:57:08 +0000 (15:57 -0800)
* 'mac-fixes' of git://git.hohndel.org/subsurface:
  Preference handling on Mac


Trivial merge