Merge branch 'freediving-tweaks' of git://github.com/mguentner/subsurface

Merge freediving tweaks (zoom in on short dives etc) from Maximilian
Güntner.

Trivial conflicts in display.h due to unrelated printing stuff just
happening to be added nearby.

* 'freediving-tweaks' of git://github.com/mguentner/subsurface:
  moved zoomed_plot to display.h
  plot the time with a fixed padding (leading zero)
  updated/corrected comment
  added "Zoom" button and improved scaling
  fixed indentation
  use increments that make sense for 600 seconds
  Plot shorter (apnea) dives with a reasonable scale

diff --cc display.h
index d054b699450161de1fc2e8699ac5e58173e06357,5f99849b7b496a699c6c9431f042f5cb725287f8..4e1511656ad5d20b38948b8819a5ad25aefe5ee0
--- 1/display.h
--- 2/display.h
+++ b/display.h
@@@ -26,9 -26,6 +26,11 @@@ extern void plot(struct graphics_contex
  extern void init_profile_background(struct graphics_context *gc);
  extern void attach_tooltip(int x, int y, int w, int h, const char *text);
  
 +struct options {
 +      enum { PRETTY, TABLE } type;
 +      gboolean print_profiles;
 +};
 +
+ extern char zoomed_plot;
+ 
  #endif

diff --cc gtk-gui.c
Simple merge

diff --cc profile.c
Simple merge