Merge with master

Sam Gondelman committed 11 years ago

Commit 19ec0802 parents 778e19a 0bef506214 files · +6701 −6001Browse files

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

Unified · Split

interface/src/Menu.h+1−0

@@ -201,6 +201,7 @@ namespace MenuOption { · 200 unmodified lines
201	const QString FrameTimer = "Show Timer";	201	const QString FrameTimer = "Show Timer";
202	const QString Fullscreen = "Fullscreen";	202	const QString Fullscreen = "Fullscreen";
203	const QString FullscreenMirror = "Fullscreen Mirror";	203	const QString FullscreenMirror = "Fullscreen Mirror";
		204	const QString CenterPlayerInView = "Center Player In View";
204	const QString GlowWhenSpeaking = "Glow When Speaking";	205	const QString GlowWhenSpeaking = "Glow When Speaking";
205	const QString NamesAboveHeads = "Names Above Heads";	206	const QString NamesAboveHeads = "Names Above Heads";
206	const QString HMDTools = "HMD Tools";	207	const QString HMDTools = "HMD Tools";