mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-27 21:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"

Browse source 
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
This commit is contained in:
Jules Blok 2015-12-23 00:35:19 +01:00
parent a55af16131
commit 8bda12bcfd
12 changed files with 10 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Core/HotkeyManager.cpp
View file

@ -126,12 +126,6 @@ const std::string hotkey_labels[] =
_trans("Undo Save State"),
_trans("Save State"),
_trans("Load State"),
_trans("Toggle 3D Preset"),
_trans("Use 3D Preset 1"),
_trans("Use 3D Preset 2"),
_trans("Use 3D Preset 3"),
};
static_assert(NUM_HOTKEYS == sizeof(hotkey_labels) / sizeof(hotkey_labels[0]), "Wrong count of hotkey_labels");