Merge branch 'bugfixes' of github.com:danilocesar/subsurface

Fixed one conflict in qt-ui/diveplanner.cpp - please check I got this
right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 2009740fe..0b0b0055d 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -29,7 +29,7 @@ class DiveListView;
 class GlobeGPS;
 class MainTab;
 class ProfileGraphicsView;
-class QTextBrowser;
+class QWebView;
 
 enum MainWindowTitleFormat { MWTF_DEFAULT, MWTF_FILENAME };
 
@@ -110,7 +110,7 @@ private:
 	Ui::MainWindow *ui;
 	QAction *actionNextDive;
 	QAction *actionPreviousDive;
-	QTextBrowser *helpView;
+	QWebView *helpView;
 	QString filter();
 	bool askSaveChanges();
 	void writeSettings();