summaryrefslogtreecommitdiffstats
path: root/qt-ui/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-31 22:18:00 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-31 22:18:00 -0700
commit0de21c24fa0bfdad5a828a39821c7761ecc2f946 (patch)
tree30d6a5bb9bc3bd8a1ddeae731ce72d749b002030 /qt-ui/mainwindow.cpp
parent45767961e88c85eb3bf3f8cbff1c9c675eca4904 (diff)
parent18ec989ef51b5357d76db85d467626141d5e2429 (diff)
downloadsubsurface-0de21c24fa0bfdad5a828a39821c7761ecc2f946.tar.gz
Merge branch 'planner-mods'
Nothing exciting here, just a few independent changes close to each other. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
-rw-r--r--qt-ui/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 53f7a15df..b63225295 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -85,7 +85,7 @@ MainWindow::MainWindow() : QMainWindow(),
ui.divePlannerWidget->settingsChanged();
#ifndef ENABLE_PLANNER
- ui.menuLog->removeAction(ui.actionDivePlanner);
+// ui.menuLog->removeAction(ui.actionDivePlanner);
#endif
#ifdef NO_MARBLE
ui.layoutWidget->hide();