]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1531a37 0c343f2)
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 20:19:23 +0000 (13:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 20:19:23 +0000 (13:19 -0700)
* 'uemis-integration' of git://github.com/dirkhh/subsurface:
  Much nicer implementation of uemis sample parsing - and add events, too
  Add working pressure to uemis tank data


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