drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2021-01-11 08:47:07 +00:00
commit 3bc436988d
87 changed files with 104 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tmk_core/common/report.h
View file

@ -123,12 +123,6 @@ enum desktop_usages {
#define KEYBOARD_REPORT_KEYS 6
/* VUSB hardcodes keyboard and mouse+extrakey only */
#if defined(PROTOCOL_VUSB)
# undef KEYBOARD_SHARED_EP
# undef MOUSE_SHARED_EP
#endif
#ifdef __cplusplus
extern "C" {
#endif