Home Explore Help
Register Sign In
HuiJun
/
qmk_firmware
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

QMK Bot 3 years ago
parent
9db21f522e 312b1b95a8
commit
a2f3d050f4
1 changed files with 2 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      docs/config_options.md

+ 2 - 0
docs/config_options.md
View File 

@@ -404,6 +404,8 @@ However, this will automatically disable the legacy TMK Macros and Functions fea
 
 
 Use these to enable or disable building certain features. The more you have enabled the bigger your firmware will be, and you run the risk of building a firmware too large for your MCU.
 
 
+* `MAGIC_ENABLE`
 
+  * MAGIC actions (BOOTMAGIC without the boot)
 
 * `BOOTMAGIC_ENABLE`
 
   * Virtual DIP switch configuration
 
 * `MOUSEKEY_ENABLE`