Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:57:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing bad merge

Browse source
This commit is contained in:
Brad Davis 2015-04-21 13:18:53 -07:00
parent 7a33474245
commit e68f149aac
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -245,7 +245,7 @@ Menu::Menu() {
false, false,
qApp, qApp,
SLOT(setFullscreen(bool))); SLOT(setFullscreen(bool)));
#endif
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson,
0, // QML Qt::Key_P, 0, // QML Qt::Key_P,
true, qApp, SLOT(cameraMenuChanged())); true, qApp, SLOT(cameraMenuChanged()));