diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-27 11:05:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-27 11:05:39 -0700 |
| commit | 30ee87be92f0a0fffc98106852d9623a65dfe4ed (patch) | |
| tree | 8a2f2f8ee4ce9c6db1167269bad04ff369a38a5d /info.c | |
| parent | 1bf28b68c9dc9b929b1372b79920311a9c10e4cc (diff) | |
| parent | f3134cbb8995267e6a18b9564f3022e7fe7314a9 (diff) | |
| download | subsurface-30ee87be92f0a0fffc98106852d9623a65dfe4ed.tar.gz | |
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)
Diffstat (limited to 'info.c')
0 files changed, 0 insertions, 0 deletions