Merge branch 'master' into storm so branches are the same.

This commit is contained in:
Storm Dragon 2022-02-19 16:44:34 -05:00
commit a3bb82e524

View File

@ -110,10 +110,12 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
KEY_FENRIR,KEY_X=set_mark KEY_FENRIR,KEY_X=set_mark
KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
KEY_FENRIR,KEY_F10=toggle_vmenu_mode KEY_FENRIR,KEY_F10=toggle_vmenu_mode
KEY_FENRIR,KEY_UP=inc_speech_volume KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
KEY_FENRIR,KEY_DOWN=dec_speech_volume KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
KEY_FENRIR,KEY_RIGHT=inc_speech_rate KEY_FENRIR,KEY_RIGHT=next_quick_menu_entry
KEY_FENRIR,KEY_LEFT=dec_speech_rate KEY_FENRIR,KEY_UP=next_quick_menu_value
KEY_FENRIR,KEY_LEFT=prev_quick_menu_entry
KEY_FENRIR,KEY_DOWN=prev_quick_menu_value
KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
KEY_FENRIR,KEY_CTRL,KEY_S=save_settings KEY_FENRIR,KEY_CTRL,KEY_S=save_settings