Merge remote-tracking branch 'origin/master' into develop

2021-10-26 04:15:18 +00:00
parent c97539efea 028edfc2df
commit cf1749323c
31 changed files with 4 additions and 35 deletions
--- a/show_options.mk
+++ b/show_options.mk
@@ -61,7 +61,6 @@ OTHER_OPTION_NAMES = \
  HAPTIC_ENABLE \
  HHKB_RN42_ENABLE \
  ISSI_ENABLE \
-  KEYBOARD_LOCK_ENABLE \
  KEYLOGGER_ENABLE \
  LCD_BACKLIGHT_ENABLE \
  MACROS_ENABLED \