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)

1 files changed, 1 insertions, 0 deletions

diff --git a/main.c b/main.c
index ef6212ae2..92eb9ee09 100644
--- a/main.c
+++ b/main.c
@@ -126,6 +126,7 @@ int main(int argc, char **argv)
 	int i;
 
 	output_units = SI_units;
+
 	parse_xml_init();
 
 	init_ui(argc, argv);