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

This commit is contained in:
Drashna Jael're 2022-03-26 13:37:01 -07:00
commit 80102c0e83
No known key found for this signature in database
GPG key ID: DBA1FD3A860D1B11
12 changed files with 56 additions and 49 deletions

View file

@ -200,6 +200,10 @@ extern layer_state_t layer_state;
# include "dynamic_keymap.h"
#endif
#ifdef JOYSTICK_ENABLE
# include "joystick.h"
#endif
#ifdef XAP_ENABLE
# include "xap.h"
#endif