diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /src/MainWindow.ui | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
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> |