]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f967d6f 97a1dd6)
Merge branch 'forlinus' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 17:41:05 +0000 (15:41 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 17:41:05 +0000 (15:41 -0200)
* 'forlinus' of git://github.com/dirkhh/subsurface:
  Make sure SAC and OTU get recalculated after cylinder info was changed


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