From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Aug 2012 20:20:23 +0000 (-0700)
Subject: Merge branch 'freediving-tweaks' of git://github.com/mguentner/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=9d46581913ce33664e333a4d6eaf7f4e26e20b1c;p=ext%2Fsubsurface.git

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
---

9d46581913ce33664e333a4d6eaf7f4e26e20b1c
diff --cc display.h
index d054b69,5f99849..4e15116
--- a/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