Merge branch 'master' into allin

update 201129
2020-11-29 00:22:09 +01:00
parent 7bc372633f 93bdc9f75b
commit 72b21f018e
20 changed files with 1235 additions and 577 deletions
--- a/client/src/scripting.c
+++ b/client/src/scripting.c
@@ -1347,7 +1347,7 @@ int set_pm3_libraries(lua_State *L) {
        {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
        {"mfDarkside",                  l_mfDarkside},
        {"foobar",                      l_foobar},
-        {"kbd_enter_pressed",               l_kbd_enter_pressed},
+        {"kbd_enter_pressed",           l_kbd_enter_pressed},
        {"clearCommandBuffer",          l_clearCommandBuffer},
        {"console",                     l_CmdConsole},
        {"iso15693_crc",                l_iso15693_crc},