diff options
author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
---|---|---|
committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
commit | 430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch) | |
tree | f3d13283dd812277bc30d75dff32ea16508b58c8 /docs/make_instructions.md | |
parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'docs/make_instructions.md')
-rw-r--r-- | docs/make_instructions.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/make_instructions.md b/docs/make_instructions.md index 64c1cb0f00..299c5785b2 100644 --- a/docs/make_instructions.md +++ b/docs/make_instructions.md @@ -158,6 +158,10 @@ This enables using the Quantum SYSEX API to send strings (somewhere?) This consumes about 5390 bytes. +`KEY_LOCK_ENABLE` + +This enables [key lock](key_lock.md). This consumes an additional 260 bytes. + ## Customizing Makefile options on a per-keymap basis If your keymap directory has a file called `Makefile` (note the filename), any Makefile options you set in that file will take precedence over other Makefile options for your particular keyboard. |