diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-25 12:11:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-25 12:11:36 +0000 |
| commit | 2df1b124a72fa02bfa5cb0db9752a64097b5ff9e (patch) | |
| tree | 6d6c311765c81910592dc356da1074d34d04a4f0 /quantum/mousekey.c | |
| parent | f2729e897400fa4c7f1f1e18780db7718b9ae7a6 (diff) | |
| parent | 816f2f9cc234b5a98512a483b2781b1c2875f24f (diff) | |
| download | qmk_firmware-2df1b124a72fa02bfa5cb0db9752a64097b5ff9e.tar.gz qmk_firmware-2df1b124a72fa02bfa5cb0db9752a64097b5ff9e.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/mousekey.c')
| -rw-r--r-- | quantum/mousekey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/mousekey.c b/quantum/mousekey.c index 63e74baa9..99bfd6b96 100644 --- a/quantum/mousekey.c +++ b/quantum/mousekey.c | |||
| @@ -108,7 +108,7 @@ static uint8_t wheel_unit(void) { | |||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | # else /* #ifndef MK_COMBINED */ | 110 | # else /* #ifndef MK_COMBINED */ |
| 111 | # ifndef MK_KINETIC_SPEED | 111 | # ifdef MK_KINETIC_SPEED |
| 112 | 112 | ||
| 113 | /* | 113 | /* |
| 114 | * Kinetic movement acceleration algorithm | 114 | * Kinetic movement acceleration algorithm |