diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-26 14:54:48 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-26 14:54:48 +0000 |
commit | 3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7 (patch) | |
tree | b33fd582a773e6daea61cb888738a763b2156c85 /keyboards | |
parent | 1d10a78068852fb656953b3f5de6dcec077624a7 (diff) | |
parent | f07de1b3094fbb94a70435c80b06b676db1f46b8 (diff) | |
download | qmk_firmware-3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7.tar.gz qmk_firmware-3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/metamechs/timberwolf/config.h | 1 | ||||
-rw-r--r-- | keyboards/mint60/config.h | 2 | ||||
-rw-r--r-- | keyboards/miuni32/config.h | 1 | ||||
-rw-r--r-- | keyboards/snampad/config.h | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h index 353d8073a1..fa0791a8ea 100644 --- a/keyboards/metamechs/timberwolf/config.h +++ b/keyboards/metamechs/timberwolf/config.h @@ -96,7 +96,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define FORCE_NKRO /* -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h index c38add26e0..b421349d86 100644 --- a/keyboards/mint60/config.h +++ b/keyboards/mint60/config.h @@ -95,7 +95,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ //#define FORCE_NKRO -/* /* ws2812 RGB LED */ #define RGB_DI_PIN D3 @@ -124,4 +123,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h index 1289dd07be..c25dfcaf99 100644 --- a/keyboards/miuni32/config.h +++ b/keyboards/miuni32/config.h @@ -86,7 +86,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define FORCE_NKRO /* -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h index 8b08f55025..64bb16fb40 100644 --- a/keyboards/snampad/config.h +++ b/keyboards/snampad/config.h @@ -118,7 +118,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define FORCE_NKRO /* -/* * Feature disable options * These options are also useful to firmware size reduction. */ |