josh/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
This commit is contained in:
James Young
2021-08-19 11:32:23 -07:00
parent 9d1c98c891 f4f679779e
commit 4279b14adf
139 changed files with 6481 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
View File

@@ -2,3 +2,8 @@ VIA_ENABLE = yes
MOUSEKEY_ENABLE = no
TAP_DANCE_ENABLE = yes
BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
TD_LSFT_CAPSLOCK_ENABLE = yes
IDLE_TIMEOUT_ENABLE = yes
STARTUP_NUMLOCK_ON = yes
ENCODER_DEFAULTACTIONS_ENABLE = yes