Merge branch 'master' into jgrpp

# Conflicts: # src/saveload/saveload.cpp
2018-09-20 08:32:56 +01:00
parent 6f9f467dbe 59a1614ba0
commit 6bcc705c7c
15 changed files with 75 additions and 22 deletions
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -41,6 +41,7 @@ static const KeycodeNames _keycode_to_name[] = {
 	{"GLOBAL", WKC_GLOBAL_HOTKEY},
 	{"ESC", WKC_ESC},
 	{"DEL", WKC_DELETE},
+	{"BACKSPACE", WKC_BACKSPACE},
 	{"RETURN", WKC_RETURN},
 	{"BACKQUOTE", WKC_BACKQUOTE},
 	{"F1", WKC_F1},