Skip to content
Snippets Groups Projects
Commit 2efb8a3f authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

merge -> combine, since we already use merge with a different signification

parent c57a63bc
No related branches found
No related tags found
No related merge requests found
// $Id: GUI.cpp,v 1.209 2002-11-05 19:52:06 geuzaine Exp $ // $Id: GUI.cpp,v 1.210 2002-11-06 04:35:15 geuzaine Exp $
// //
// Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle
// //
...@@ -801,9 +801,9 @@ void GUI::create_menu_window(int argc, char **argv){ ...@@ -801,9 +801,9 @@ void GUI::create_menu_window(int argc, char **argv){
(Fl_Callback *)view_duplicate_cb, (void*)i, 0) ; (Fl_Callback *)view_duplicate_cb, (void*)i, 0) ;
pop->add("Duplicate/View with options", 0, pop->add("Duplicate/View with options", 0,
(Fl_Callback *)view_duplicate_with_options_cb, (void*)i, 0) ; (Fl_Callback *)view_duplicate_with_options_cb, (void*)i, 0) ;
pop->add("Merge/All views", 0, pop->add("Combine/All views", 0,
(Fl_Callback *)view_merge_all_cb, (void*)i, 0) ; (Fl_Callback *)view_merge_all_cb, (void*)i, 0) ;
pop->add("Merge/All visible views", 0, pop->add("Combine/All visible views", 0,
(Fl_Callback *)view_merge_visible_cb, (void*)i, 0) ; (Fl_Callback *)view_merge_visible_cb, (void*)i, 0) ;
pop->add("Save as/ASCII view...", 0, pop->add("Save as/ASCII view...", 0,
(Fl_Callback *)view_save_ascii_cb, (void*)i, 0) ; (Fl_Callback *)view_save_ascii_cb, (void*)i, 0) ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment