Showing the changes to interface/src/Menu.cpp (1 of 56 files). Show all
Unified · Split
| @@ -251,6 +251,7 @@ Menu::Menu() { · 250 unmodified lines | ||
| 251 | 251 | qApp, |
| 252 | 252 | SLOT(setFullscreen(bool))); |
| 253 | 253 | #endif |
| 254 | +<<<<<<< HEAD | |
| 254 | 255 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, |
| 255 | 256 | 0, // QML Qt::Key_P, |
| 256 | 257 | true, qApp, SLOT(cameraMenuChanged())); |