Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nothing to see here, move along

Browse source
This commit is contained in:
Brad Davis 2015-04-16 14:10:29 -07:00
parent ce6b7e7aec
commit a624ff43c4
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Menu.cpp
View file

@ -251,7 +251,6 @@ Menu::Menu() {
qApp, qApp,
SLOT(setFullscreen(bool))); SLOT(setFullscreen(bool)));
#endif #endif
<<<<<<< HEAD
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()));