History

Merge branch 'master' into tony/improved-avatar-debug-draw

Anthony J. Thibault committed 10 years ago

Commit 80a349c2 parents 9821c27 3507434150 files · +2127 −1244Browse files

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

Unified · Split

interface/src/Menu.cpp+0−2
@@ -566,8 +566,6 @@ Menu::Menu() { · 565 unmodified lines
566 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);566 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);
567 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings);567 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings);
568 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);568 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);
569 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SupressDeadlockWatchdogStatus, 0, false,
570 qApp, SLOT(toggleSuppressDeadlockWatchdogStatus(bool)));
571 569
572 570
573 // Developer > Audio >>>571 // Developer > Audio >>>