diff options
| author | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
|---|---|---|
| committer | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
| commit | 2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch) | |
| tree | 3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /docs/_summary.md | |
| parent | 3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff) | |
| parent | 2013f6313430b977e557e482d30daa279a46e75d (diff) | |
| download | qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.zip | |
Merge branch 'master' into meteor
Diffstat (limited to 'docs/_summary.md')
| -rw-r--r-- | docs/_summary.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_summary.md b/docs/_summary.md index 9ed55a3d0..0c4371215 100644 --- a/docs/_summary.md +++ b/docs/_summary.md | |||
| @@ -103,6 +103,7 @@ | |||
| 103 | * [DIP Switch](feature_dip_switch.md) | 103 | * [DIP Switch](feature_dip_switch.md) |
| 104 | * [Encoders](feature_encoders.md) | 104 | * [Encoders](feature_encoders.md) |
| 105 | * [Haptic Feedback](feature_haptic_feedback.md) | 105 | * [Haptic Feedback](feature_haptic_feedback.md) |
| 106 | * [Joystick](feature_joystick.md) | ||
| 106 | * [Proton C Conversion](proton_c_conversion.md) | 107 | * [Proton C Conversion](proton_c_conversion.md) |
| 107 | * [PS/2 Mouse](feature_ps2_mouse.md) | 108 | * [PS/2 Mouse](feature_ps2_mouse.md) |
| 108 | * [Split Keyboard](feature_split_keyboard.md) | 109 | * [Split Keyboard](feature_split_keyboard.md) |