Merge branch 'ui' of git://github.com/dirkhh/subsurface

* 'ui' of git://github.com/dirkhh/subsurface:
  Disable sorting by dive number
  Fix oversight in preference implementation
  Make columns for temperature, cylinder, and nitrox optional
  Show dive number in dive list
  Improve time marker handling and add printing of some time labels

1 files changed, 3 insertions, 0 deletions

diff --git a/display-gtk.h b/display-gtk.h
index fe373a14f..fb2b9af5b 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -12,6 +12,9 @@ typedef struct {
 } progressbar_t;
 
 typedef struct {
+	gboolean cylinder;
+	gboolean temperature;
+	gboolean nitrox;
 	gboolean sac;
 	gboolean otu;
 } visible_cols_t;