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
223	addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,	223	addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
224	qApp, SLOT(packageModel()));	224	qApp, SLOT(packageModel()));
225		225
226	MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH());	226	addMenu(DisplayPlugin::MENU_PATH());
227	{	227	{
228	MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);	228	MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
229	QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);	229	QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);