History

resolve conflicts on merge with upstream/master

Stephen Birarda committed 11 years ago

Commit fa0abe22 parents a9a1947 08986dc19 files · +675 −84Browse files

Showing the changes to interface/src/Menu.cpp (1 of 19 files). Show all

Unified · Split

interface/src/Menu.cpp+1−1
@@ -223,7 +223,7 @@ Menu::Menu() { · 222 unmodified lines
223223 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
224224 qApp, SLOT(packageModel()));
225225
226− MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH());
226+ addMenu(DisplayPlugin::MENU_PATH());
227227 {
228228 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
229229 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);