Merge remote-tracking branch 'upstream/master' into develop

2021-01-20 10:00:28 +11:00
parent 78fe155b72 1e1b469fa2
commit 9e18f41fcf
285 changed files with 52 additions and 332 deletions
--- a/keyboards/mechmini/v1/config.h
+++ b/keyboards/mechmini/v1/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    MECHKEYS
 #define PRODUCT         Mechmini
-#define DESCRIPTION     40% modular keyboard

 /* matrix size */
 #define MATRIX_ROWS 4
--- a/keyboards/mechmini/v2/config.h
+++ b/keyboards/mechmini/v2/config.h
@@ -24,8 +24,6 @@
 #define MANUFACTURER    MECHKEYS
 #undef PRODUCT
 #define PRODUCT         Mechmini 2
-#undef DESCRIPTION
-#define DESCRIPTION     40% modular keyboard

 /* key matrix size */
 #undef MATRIX_COLS