Merge branch 'master' of https://github.com/worklist/hifi into lod_slider

ZappoMan committed 13 years ago

Commit 3a6f8ea2 parents dd7eb66 0ea60c110 files · +60 −82Browse files

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

Unified · Split

interface/src/Menu.cpp+0−1

@@ -252,7 +252,6 @@ Menu::Menu() : · 251 unmodified lines
252		252
253	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true);	253	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, Qt::Key_Asterisk, true);
254	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere, Qt::SHIFT \| Qt::Key_A, true);	254	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere, Qt::SHIFT \| Qt::Key_A, true);
255	addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::GroundPlane, 0, true);
256	addActionToQMenuAndActionHash(renderOptionsMenu,	255	addActionToQMenuAndActionHash(renderOptionsMenu,
257	MenuOption::GlowMode,	256	MenuOption::GlowMode,
258	0,	257	0,