Merge branch 'bleed' of github.com:chrys87/fenrir into bleed

This commit is contained in:
chrys 2018-03-24 21:30:03 +01:00
commit 7db5234c03
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ KEY_FENRIR,KEY_KPASTERISK=toggle_highlight_tracking
KEY_FENRIR,KEY_Q=quit_fenrir KEY_FENRIR,KEY_Q=quit_fenrir
KEY_FENRIR,KEY_T=time KEY_FENRIR,KEY_T=time
2,KEY_FENRIR,KEY_T=date 2,KEY_FENRIR,KEY_T=date
#=toggle_auto_indent KEY_KPSLASH=toggle_auto_indent
KEY_KPMINUS=attribute_cursor KEY_KPMINUS=attribute_cursor
KEY_FENRIR,KEY_S=spell_check KEY_FENRIR,KEY_S=spell_check
2,KEY_FENRIR,KEY_S=add_word_to_spell_check 2,KEY_FENRIR,KEY_S=add_word_to_spell_check

View File

@ -85,7 +85,7 @@ KEY_FENRIR,KEY_Y=toggle_highlight_tracking
KEY_FENRIR,KEY_Q=quit_fenrir KEY_FENRIR,KEY_Q=quit_fenrir
KEY_FENRIR,KEY_T=time KEY_FENRIR,KEY_T=time
2,KEY_FENRIR,KEY_T=date 2,KEY_FENRIR,KEY_T=date
#=toggle_auto_indent KEY_FENRIR,KEY_BACKSLASH=toggle_auto_indent
KEY_FENRIR<KEY_MINUS=attribute_cursor KEY_FENRIR<KEY_MINUS=attribute_cursor
KEY_FENRIR,KEY_S=spell_check KEY_FENRIR,KEY_S=spell_check
2,KEY_FENRIR,KEY_S=add_word_to_spell_check 2,KEY_FENRIR,KEY_S=add_word_to_spell_check