diff options
author | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
commit | a4a64e7c26a0eb523f5b271c9d90f091e5933ebb (patch) | |
tree | 6e247c3f46c23a6c85b4740a2ff99abaa25fe9bd /src/MainWindow.ui | |
parent | 51f24b998ba555d15f924ccd4fb5b46219f6537b (diff) | |
parent | f577f91d25071f5ad1a9fdb6ed7c6dd3aa4c1008 (diff) |
Merge remote-tracking branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/MainWindow.ui')
-rw-r--r-- | src/MainWindow.ui | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/MainWindow.ui b/src/MainWindow.ui index dc73c05..d1bdb00 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -218,6 +218,7 @@ <addaction name="helpActionAbout"/> <addaction name="helpActionHomepage"/> <addaction name="helpActionManual"/> + <addaction name="helpActionOpenGLInfo"/> </widget> <addaction name="menu_File"/> <addaction name="menu_Edit"/> @@ -666,6 +667,11 @@ <string>Export as CSG...</string> </property> </action> + <action name="helpActionOpenGLInfo"> + <property name="text"> + <string>OpenGL info</string> + </property> + </action> </widget> <customwidgets> <customwidget> |