diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2012-05-28 16:48:46 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2012-05-28 16:48:46 (GMT) |
| commit | dd2002a81673b3875ce8c4e8a61cb10278c4eb03 (patch) | |
| tree | 7aaadf1c9b12cd37a7a913d3e76256f6406fa939 /src/MainWindow.ui | |
| parent | 4381762f5aa2e6a56258618e585e1510ead88684 (diff) | |
| parent | 67eb2ebe90447e966dc1e08b91c43d937c521583 (diff) | |
Tidy up code. Generate proper test png images. Merge branch 'master' into caliston1.
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/MainWindow.ui')
| -rw-r--r-- | src/MainWindow.ui | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/MainWindow.ui b/src/MainWindow.ui index f89e0d4..13bb226 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -222,7 +222,7 @@ <addaction name="helpActionAbout"/> <addaction name="helpActionHomepage"/> <addaction name="helpActionManual"/> - <addaction name="helpActionOpenGLInfo"/> + <addaction name="helpActionLibraryInfo"/> </widget> <addaction name="menu_File"/> <addaction name="menu_Edit"/> @@ -671,9 +671,9 @@ <string>Export as CSG...</string> </property> </action> - <action name="helpActionOpenGLInfo"> + <action name="helpActionLibraryInfo"> <property name="text"> - <string>OpenGL info</string> + <string>Library info</string> </property> </action> </widget> |