Merge branch 'master' into event

This commit is contained in:
chrys 2017-05-04 21:31:21 +02:00
commit 065f93f46f

View File

@ -14,15 +14,15 @@ KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
KEY_FENRIR,KEY_K=review_curr_word KEY_FENRIR,KEY_K=review_curr_word
KEY_FENRIR,KEY_J=review_prev_word KEY_FENRIR,KEY_J=review_prev_word
KEY_FENRIR,KEY_L=review_next_word KEY_FENRIR,KEY_L=review_next_word
2,KEY_FENRIR,KEY_K=review_curr_word_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_K=review_curr_word_phonetic
2,KEY_FENRIR,KEY_J=review_prev_word_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_J=review_prev_word_phonetic
2,KEY_FENRIR,KEY_L=review_next_word_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_L=review_next_word_phonetic
KEY_FENRIR,KEY_COMMA=review_curr_char KEY_FENRIR,KEY_COMMA=review_curr_char
KEY_FENRIR,KEY_M=review_prev_char KEY_FENRIR,KEY_M=review_prev_char
KEY_FENRIR,KEY_DOT=review_next_char KEY_FENRIR,KEY_DOT=review_next_char
2,KEY_FENRIR,KEY_COMMA=curr_char_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_COMMA=curr_char_phonetic
2,KEY_FENRIR,KEY_M=prev_char_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_M=prev_char_phonetic
2,KEY_FENRIR,KEY_DOT=prev_char_phonetic KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_DOT=prev_char_phonetic
KEY_FENRIR,KEY_CTRL,KEY_I=review_up KEY_FENRIR,KEY_CTRL,KEY_I=review_up
KEY_FENRIR,KEY_CTRL,KEY_COMMA=review_down KEY_FENRIR,KEY_CTRL,KEY_COMMA=review_down
KEY_FENRIR,KEY_SLASH=exit_review KEY_FENRIR,KEY_SLASH=exit_review