]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9cf8d98 2db8559)
Merge branch 'for-linus' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 17:08:27 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 17:09:56 +0000 (10:09 -0700)
commit15e3b5f4414d320dbace1bd3913b07d35bd9e9ee
treefbbe0d04c046a3bf7a94efc257fdeb8c92a067b1tree | snapshot
parent9cf8d98711dff888f5bfa8efd52ca7b8cf8bfa07commit | diff
parent2db85596e52ea0852bfe67f2fb67df8440b43d1bcommit | diff
Merge branch 'for-linus' of git://github.com/dirkhh/subsurface

* 'for-linus' of git://github.com/dirkhh/subsurface:
  Attempt to get the location column to resize in a sensible way
  Minor tweaks to column headers

[ Fixed up minor semantic merge conflict due to the change to make
  'dive_list' internal to divelist.c ]
divelist.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)