qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-30 05:50:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Drashna Jael're
2024-02-03 01:06:39 -08:00
parent a37de6dc94 11c631027c
commit 5a9481b831
500 changed files with 11337 additions and 4928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/quantum.h
+4 -1
View File
@@ -42,7 +42,6 @@
#include "action_layer.h"
#include "eeconfig.h"
#include "bootloader.h"
#include "bootmagic.h"
#include "timer.h"
#include "sync_timer.h"
#include "gpio.h"
@@ -59,6 +58,10 @@
#include <stdio.h>
#include <string.h>
#ifdef BOOTMAGIC_ENABLE
# include "bootmagic.h"
#endif
#ifdef DEFERRED_EXEC_ENABLE
# include "deferred_exec.h"
#endif