diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
| commit | 150676ce3df0f60bd99204886c3a4e458253c093 (patch) | |
| tree | d722dafb6487d2dc56e78f8e39965fb1b7bed362 /qt-ui/mainwindow.ui | |
| parent | 48fe5254dc9540f6b9fc13ab17029e6c7b8de975 (diff) | |
| parent | 7264ec2fa877eeffa99745ac4d7af91b93217aa5 (diff) | |
| download | subsurface-150676ce3df0f60bd99204886c3a4e458253c093.tar.gz | |
Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
subsurface.pro
Diffstat (limited to 'qt-ui/mainwindow.ui')
| -rw-r--r-- | qt-ui/mainwindow.ui | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 63d78c702..dca59e706 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -707,6 +707,8 @@ p, li { white-space: pre-wrap; } <addaction name="actionPrint"/> <addaction name="actionPreferences"/> <addaction name="separator"/> + <addaction name="actionConfigure_Dive_Computer"/> + <addaction name="separator"/> <addaction name="actionRecent1"/> <addaction name="actionRecent2"/> <addaction name="actionRecent3"/> @@ -1067,6 +1069,11 @@ p, li { white-space: pre-wrap; } <string>Ctrl+E</string> </property> </action> + <action name="actionConfigure_Dive_Computer"> + <property name="text"> + <string>Configure Dive Computer</string> + </property> + </action> </widget> <customwidgets> <customwidget> |