]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 490e98d df1f506)
Merge git://git.tdb.fi/ext/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)
commite4955f9be116cd413e8ee3986d737e9e1b95e348
tree255e723a9f27f663eb05c611075ac9e573b0a35dtree | snapshot
parent490e98dadfc71a318a934f4196821be69c4b6342commit | diff
parentdf1f506b4e874a9c5afad8d31989a2389bbcdf2dcommit | diff
Merge git://git.tdb.fi/ext/subsurface

Pull a few buglet fixes from Mikko Rasa.

Some trivial conflicts due to changes in the dive selection logic, and
using the new "for_each_dive()" helper.

* git://git.tdb.fi/ext/subsurface:
  Check if multi-dive editing is actually needed
  Fix an off-by-one error in buffer allocation
gtk-gui.c diff1 | diff2 | blob | history
info.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)