Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh

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

Conflicts:
	subsurface.pro

1 files changed, 7 insertions, 0 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index b27f2b606..74015c73f 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -41,6 +41,7 @@
 #include "worldmap-save.h"
 #include "updatemanager.h"
 #include "planner.h"
+#include "configuredivecomputerdialog.h"
 #ifndef NO_PRINTING
 #include <QPrintDialog>
 #include "printdialog.h"
@@ -1298,6 +1299,12 @@ void MainWindow::on_actionExport_triggered()
 	diveLogExport.exec();
 }
 
+void MainWindow::on_actionConfigure_Dive_Computer_triggered()
+{
+	ConfigureDiveComputerDialog *dcConfig = new ConfigureDiveComputerDialog(this);
+	dcConfig->show();
+}
+
 void MainWindow::setEnabledToolbar(bool arg1)
 {
 	 QList<QToolButton*> toolBar;