resolve conflicts in merge with upstream/master

Stephen Birarda committed 12 years ago

Commit f13aa322 parents 417aa7a f4f8fe230 files · +695 −172Browse files

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

Unified · Split

@@ -91,7 +91,7 @@ Menu::Menu() : · 90 unmodified lines
91	91	SLOT(login())));
92	92
93	93	addDisabledActionAndSeparator(fileMenu, "Scripts");
94		− addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL \| Qt::Key_O, appInstance, SLOT(loadScript()));
	94	+ addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL \| Qt::Key_O, appInstance, SLOT(loadDialog()));
95	95	_activeScriptsMenu = fileMenu->addMenu("Running Scripts");
96	96
97	97	addDisabledActionAndSeparator(fileMenu, "Voxels");