History

resolve conflicts on merge, add cstring inc

Stephen Birarda committed 11 years ago

Commit dfb02ae2 parents ba09bba 315b932188 files · +5596 −1978Browse files

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

Unified · Split

interface/src/Menu.cpp+0−3
@@ -636,9 +636,6 @@ Menu::Menu() : · 635 unmodified lines
636 636
637 connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));637 connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
638 638
639 QMenu* experimentalOptionsMenu = developerMenu->addMenu("Experimental");
640 addCheckableActionToQMenuAndActionHash(experimentalOptionsMenu, MenuOption::StringHair, 0, false);
641
642 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,639 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
643 Qt::CTRL | Qt::SHIFT | Qt::Key_V,640 Qt::CTRL | Qt::SHIFT | Qt::Key_V,
644 this,641 this,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t