]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b659015 dfe5133)
Merge branch 'dirk'
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Sep 2011 22:17:24 +0000 (15:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Sep 2011 22:17:24 +0000 (15:17 -0700)
commitdbfce3035ef1499e47607a84b3ed07ccc95abd70
tree07e83d42ab660a80f1d4aab44aa8d427c9341307tree | snapshot
parentb6590150d68df528efd40c889ba6eea476b39873commit | diff
parentdfe5133b579d1ee999080de68041d0009aa4b5d5commit | diff
Merge branch 'dirk'

* dirk:
  Print starting and ending pressures

Fix up conflicts in profile.c due to different ways to set the text
formatting.  Dirk's 'text_format_options' thing is prettier than mine.
Use it.
profile.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)