aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-26 14:54:48 +0000
committerQMK Bot <hello@qmk.fm>2021-09-26 14:54:48 +0000
commit3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7 (patch)
treeb33fd582a773e6daea61cb888738a763b2156c85
parent1d10a78068852fb656953b3f5de6dcec077624a7 (diff)
parentf07de1b3094fbb94a70435c80b06b676db1f46b8 (diff)
downloadqmk_firmware-3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7.tar.gz
qmk_firmware-3c9b98387ca9c0f4fe9ac762577c586b7fca8dc7.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/metamechs/timberwolf/config.h1
-rw-r--r--keyboards/mint60/config.h2
-rw-r--r--keyboards/miuni32/config.h1
-rw-r--r--keyboards/snampad/config.h1
4 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h
index 353d8073a..fa0791a8e 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/>.
96//#define FORCE_NKRO 96//#define FORCE_NKRO
97 97
98/* 98/*
99/*
100 * Feature disable options 99 * Feature disable options
101 * These options are also useful to firmware size reduction. 100 * These options are also useful to firmware size reduction.
102 */ 101 */
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index c38add26e..b421349d8 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/>.
95 */ 95 */
96//#define FORCE_NKRO 96//#define FORCE_NKRO
97 97
98/*
99/* ws2812 RGB LED */ 98/* ws2812 RGB LED */
100#define RGB_DI_PIN D3 99#define RGB_DI_PIN D3
101 100
@@ -124,4 +123,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
124//#define NO_ACTION_ONESHOT 123//#define NO_ACTION_ONESHOT
125//#define NO_ACTION_MACRO 124//#define NO_ACTION_MACRO
126//#define NO_ACTION_FUNCTION 125//#define NO_ACTION_FUNCTION
127
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index 1289dd07b..c25dfcaf9 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/>.
86//#define FORCE_NKRO 86//#define FORCE_NKRO
87 87
88/* 88/*
89/*
90 * Feature disable options 89 * Feature disable options
91 * These options are also useful to firmware size reduction. 90 * These options are also useful to firmware size reduction.
92 */ 91 */
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 8b08f5502..64bb16fb4 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/>.
118//#define FORCE_NKRO 118//#define FORCE_NKRO
119 119
120/* 120/*
121/*
122 * Feature disable options 121 * Feature disable options
123 * These options are also useful to firmware size reduction. 122 * These options are also useful to firmware size reduction.
124 */ 123 */