summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-12 07:08:53 +0000
committerQMK Bot <hello@qmk.fm>2021-09-12 07:08:53 +0000
commitbb841087bbd47b0be6dffafa8a4f7a361867f71d (patch)
tree57e64f2f70c27729a84c372ef8e3bd97d5ea5a6b
parentb4588857ac847a1aedf84b0b1d808f523bd40ff6 (diff)
parent10362777a56194bf830f144d893fbd2ade2c174e (diff)
downloadqmk_firmware-bb841087bbd47b0be6dffafa8a4f7a361867f71d.tar.gz
qmk_firmware-bb841087bbd47b0be6dffafa8a4f7a361867f71d.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/ja/compatible_microcontrollers.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ja/compatible_microcontrollers.md b/docs/ja/compatible_microcontrollers.md
index 85b31f3f12..7a3484fa8c 100644
--- a/docs/ja/compatible_microcontrollers.md
+++ b/docs/ja/compatible_microcontrollers.md
@@ -1,8 +1,8 @@
# 互換性のあるマイクロコントローラ
<!---
- original document: 0.9.19:docs/compatible_microcontrollers.md
- git diff 0.9.19 HEAD -- docs/compatible_microcontrollers.md | cat
+ original document: 0.14.14:docs/compatible_microcontrollers.md
+ git diff 0.14.14 HEAD -- docs/compatible_microcontrollers.md | cat
-->
QMK は十分な容量のフラッシュメモリを備えた USB 対応 AVR または ARM マイクロコントローラで実行されます - 一般的に 32kB 以上ですが、ほとんどの機能を無効にすると*ほんの* 16kB に詰め込むことができます。