]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b4fa48 11b62a1)
Merge branch 'ui' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Oct 2011 05:03:22 +0000 (07:03 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Oct 2011 05:03:22 +0000 (07:03 +0200)
commita72408400c67a142b9abaec89df954df7dac7a71
tree821827d9e4599d1745bf62e9139de183327ffa74tree | snapshot
parent2b4fa480ae57766889c5a20ff1cb59427469d401commit | diff
parent11b62a149b0d65e37a2cedbc93c8e8d84b23e041commit | diff
Merge branch 'ui' of git://github.com/dirkhh/subsurface

* 'ui' of git://github.com/dirkhh/subsurface:
  Disable sorting by dive number
  Fix oversight in preference implementation
  Make columns for temperature, cylinder, and nitrox optional
  Show dive number in dive list
  Improve time marker handling and add printing of some time labels
profile.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)