]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1bf28b6 f3134cb)
Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 18:05:39 +0000 (11:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Sep 2011 18:05:39 +0000 (11:05 -0700)
commit30ee87be92f0a0fffc98106852d9623a65dfe4ed
tree8a2f2f8ee4ce9c6db1167269bad04ff369a38a5dtree | snapshot
parent1bf28b68c9dc9b929b1372b79920311a9c10e4cccommit | diff
parentf3134cbb8995267e6a18b9564f3022e7fe7314a9commit | diff
Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface

* 'otu-tracking-v2' of git://github.com/dirkhh/subsurface:
  Store options in gconf
  Add preference option to chose if SAC and/or OTU should be in divelist

Fix up trivial conflicts in gtk-gui.c (cleanup in gtk dialog wrt
gtk_dialog_get_content_area() having introduced a new 'vbox' widget)
gtk-gui.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)