ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
This commit is contained in:
James Young 2021-08-11 09:48:25 -07:00
commit 345f6dc4e6
No known key found for this signature in database
GPG key ID: 87CBD151019773A8
31 changed files with 961 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/rpiguy9907/southpaw66/config.h
View file

@ -18,8 +18,8 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6077
#define VENDOR_ID 0x9907 // "9907" - rpiguy9907
#define PRODUCT_ID 0x5366 // "S" "66"
#define DEVICE_VER 0x0001
#define MANUFACTURER rpiguy9907
#define PRODUCT Southpaw66