Merge pull request #3381 from Armada651/revert-3076

Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This commit is contained in:
Markus Wick committed 2015-12-28 10:18:32 +01:00
commit aabcd441d9
12 files changed
+10 -114

No files matched your search

-6
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");
-5
View File
@@ -126,11 +126,6 @@ enum Hotkey
HK_SAVE_STATE_FILE,
HK_LOAD_STATE_FILE,
HK_SWITCH_STEREOSCOPY_PRESET,
HK_USE_STEREOSCOPY_PRESET_0,
HK_USE_STEREOSCOPY_PRESET_1,
HK_USE_STEREOSCOPY_PRESET_2,
NUM_HOTKEYS,
};