]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb2114f 671f654)
Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 18:42:37 +0000 (10:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 18:42:37 +0000 (10:42 -0800)
* 'mac-fixes' of git://git.hohndel.org/subsurface:
  Split reading/writing preferences into OS specific files


Trivial merge
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)