mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Conflicts:
	subsurface.pro
This commit is contained in:
Dirk Hohndel 2014-08-18 20:25:06 -05:00
commit 150676ce3d
15 changed files with 3198 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/mainwindow.ui
View file

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