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

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

Browse source
This commit is contained in:
Nick Brassel 2021-09-15 11:40:29 +10:00
commit 3c66b9b0ec
7256 changed files with 77233 additions and 46094 deletions
Download patch file Download diff file Expand all files Collapse all files

2
quantum/quantum.h
View file

@ -164,7 +164,7 @@ extern layer_state_t layer_state;
# include "process_haptic.h"
#endif
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
# include "oled_driver.h"
#endif